From: <enl...@li...> - 2000-12-09 16:51:13
|
Enlightenment CVS committal Author : tillsan Project : e17 Module : apps/e Modified Files: border.c Log Message: just a few casts and protos to shut up some warnings =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/border.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- border.c 2000/12/09 05:33:36 1.4 +++ border.c 2000/12/09 16:51:12 1.5 @@ -15,6 +15,13 @@ static Eevent *current_ev = NULL; +/*protos to shut up the compiler :) */ +static void e_cb_border_mouse_down(E_Border *b, Eevent *e); +static void e_cb_border_mouse_up(E_Border *b, Eevent *e); +static void e_cb_border_mouse_move(E_Border *b, Eevent *e); +static void e_cb_border_mouse_in(E_Border *b, Eevent *e); +static void e_cb_border_mouse_out(E_Border *b, Eevent *e); + /* what to dowhen we're idle */ static void e_idle(void *data) @@ -49,7 +56,7 @@ { E_Border *b; - printf("map request %x\n", e->win); + printf("map request %x\n", (int) e->win); b = e_border_find_by_window(e->win); if (!b) { @@ -176,7 +183,7 @@ if (b->ignore_unmap > 0) b->ignore_unmap--; else { - printf("unmap %x\n", e->win); + printf("unmap %x\n",(int) e->win); e_action_stop_by_object(b, NULL, mouse_win_x, mouse_win_y, border_mouse_x, border_mouse_y); @@ -209,7 +216,7 @@ b = e_border_find_by_window(e->win); if (b) { - printf("destroy %x\n", e->win); + printf("destroy %x\n", (int) e->win); if (b->win.client == e->win) { e_action_stop_by_object(b, NULL, @@ -936,7 +943,7 @@ { E_Border *b; - printf("adopt %x\n", win); + printf("adopt %x\n", (int) win); /* create the struct */ b = e_border_new(); /* set the right event on the client */ @@ -1748,7 +1755,7 @@ { E_Border *b; - printf("manage %x\n", wins[i]); + printf("manage %x\n", (int) wins[i]); b = e_border_adopt(wins[i], 1); { int pl, pr, pt, pb; |
From: <enl...@li...> - 2002-02-25 18:09:16
|
Enlightenment CVS committal Author : tillsan Project : e17 Module : apps/e Dir : e17/apps/e/src Modified Files: Makefile.am config.c desktops.c epplet.c file.c file.h globals.c globals.h iconbar.c icons.c icons.h main.c resist.c view.c view.h Added Files: e_file.c e_file.h e_view_machine.c e_view_machine.h e_view_model.c e_view_model.h Log Message: ok folks, here goes. The multiple view stuff as discussed in lenght. I've managed to get metadata back up, views save their geometry on close. I'll start getting the documentation back in sync and commenting some more. Could anyone willing to clean up/fix either the iconbar dnd stuff and/or the regular dnd stuff please announce it, so we dont start duplicating work. Thanks. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/Makefile.am,v retrieving revision 1.45 retrieving revision 1.46 diff -u -3 -r1.45 -r1.46 --- Makefile.am 26 Jan 2002 02:01:42 -0000 1.45 +++ Makefile.am 25 Feb 2002 18:09:12 -0000 1.46 @@ -84,6 +84,9 @@ text.h text.c \ util.h util.c \ view.h view.c \ + e_file.h e_file.c \ + e_view_model.h e_view_model.c \ + e_view_machine.h e_view_machine.c \ e.h enlightenment_LDADD = @evas_libs@ @edb_libs@ @ebits_libs@ @ecore_libs@ @efsd_libs@ @ebg_libs@ @ferite_libs@ -lm -lc $(INTLLIBS) =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/config.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -3 -r1.29 -r1.30 --- config.c 24 Jan 2002 06:15:40 -0000 1.29 +++ config.c 25 Feb 2002 18:09:12 -0000 1.30 @@ -281,7 +281,7 @@ for (l = type->nodes; l; l = l->next) { E_Config_Node *node; - + node = l->data; switch (node->type) =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/desktops.c,v retrieving revision 1.43 retrieving revision 1.44 diff -u -3 -r1.43 -r1.44 --- desktops.c 26 Jan 2002 02:01:42 -0000 1.43 +++ desktops.c 25 Feb 2002 18:09:12 -0000 1.44 @@ -7,6 +7,7 @@ #include "icccm.h" #include "util.h" #include "object.h" +#include "e_view_machine.h" static Evas_List desktops = NULL; static Window e_base_win = 0; @@ -196,7 +197,6 @@ v->size.w = desk->real.w; v->size.h = desk->real.h; v->options.back_pixmap = 1; - v->is_desktop = 1; desk->view = v; /* fixme: later */ @@ -204,11 +204,10 @@ /* e_strdup(v->dir, "/dev"); */ /* e_strdup(v->dir, e_file_home()); */ snprintf(buf, PATH_MAX, "%s/desktop/default", e_config_user_dir()); - e_strdup(v->dir, buf); - - e_view_bg_load(v); - + + e_view_set_dir(v, buf, 1); e_view_realize(v); + e_view_populate(v); ecore_window_hint_set_borderless(v->win.base); ecore_window_hint_set_sticky(v->win.base, 1); =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/epplet.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- epplet.c 30 Jan 2002 03:16:33 -0000 1.6 +++ epplet.c 25 Feb 2002 18:09:12 -0000 1.7 @@ -1,6 +1,5 @@ #include "debug.h" #include "epplet.h" -#include "globals.h" #include "file.h" #include "observer.h" #include "desktops.h" =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/file.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- file.c 3 Nov 2001 14:55:21 -0000 1.2 +++ file.c 25 Feb 2002 18:09:12 -0000 1.3 @@ -104,7 +104,7 @@ result++; else result = path; - + D_RETURN_(result); } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/file.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- file.h 3 Nov 2001 14:55:21 -0000 1.2 +++ file.h 25 Feb 2002 18:09:12 -0000 1.3 @@ -1,5 +1,8 @@ #ifndef E_FILE_H #define E_FILE_H +#include <sys/time.h> +#include <sys/stat.h> +#include <Evas.h> time_t e_file_mod_time(char *file); int e_file_exists(char *file); =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/globals.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- globals.c 3 Nov 2001 15:33:20 -0000 1.2 +++ globals.c 25 Feb 2002 18:09:12 -0000 1.3 @@ -1,7 +1,8 @@ #include <Evas.h> #include <Ecore.h> - +#include "view.h" +#include "e_view_machine.h" Ecore_Event_Key_Modifiers multi_select_mod = ECORE_EVENT_KEY_MODIFIER_SHIFT; Ecore_Event_Key_Modifiers range_select_mod = ECORE_EVENT_KEY_MODIFIER_CTRL; -Evas_List views = NULL; +E_View_Machine *VM = NULL; =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/globals.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- globals.h 3 Nov 2001 15:33:20 -0000 1.2 +++ globals.h 25 Feb 2002 18:09:12 -0000 1.3 @@ -1,8 +1,6 @@ #ifndef E_GLOBALS_H #define E_GLOBALS_H - extern Ecore_Event_Key_Modifiers multi_select_mod; extern Ecore_Event_Key_Modifiers range_select_mod; -extern Evas_List views; - +extern E_View_Machine *VM; #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/iconbar.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- iconbar.c 20 Feb 2002 04:19:21 -0000 1.23 +++ iconbar.c 25 Feb 2002 18:09:12 -0000 1.24 @@ -18,7 +18,6 @@ static void e_ib_bit_up_cb (void *data, Ebits_Object o, char *class, int bt, int x, int y, int ox, int oy, int ow, int oh); -static void ib_reload_timeout (int val, void *data); static void ib_scroll_timeout (int val, void *data); static void ib_timeout (int val, void *data); static void ib_cancel_launch_timeout (int val, void *data); @@ -165,9 +164,9 @@ if ((ib->view) && (ib->view->evas) && (ib->clip)) evas_del_object (ib->view->evas, ib->clip); /* delete any timers intended to work on this iconbar */ - snprintf (buf, PATH_MAX, "iconbar_reload:%s", ib->view->dir); + snprintf (buf, PATH_MAX, "iconbar_reload:%s", ib->view->name); ecore_del_event_timer (buf); - snprintf (buf, PATH_MAX, "iconbar_scroll:%s", ib->view->dir); + snprintf (buf, PATH_MAX, "iconbar_scroll:%s", ib->view->name); ecore_del_event_timer (buf); /* call the destructor of the base class */ @@ -237,7 +236,7 @@ /* first we want to load the iconbar data itself - ie the config info */ /* for what icons we have and what they execute */ - snprintf (buf, PATH_MAX, "%s/.e_iconbar.db", v->dir); + snprintf (buf, PATH_MAX, "%s/.e_iconbar.db", v->model->dir); /* use the config system to simply load up the db and start making */ /* structs and lists and stuff for us... we told it how to in init */ ib = e_config_load (buf, "", cf_iconbar); @@ -284,7 +283,7 @@ /* now we need to load up a bits file that tells us where in the view the */ /* iconbar is meant to go. same place. just a slightly different name */ - snprintf (buf, PATH_MAX, "%s/.e_iconbar.bits.db", v->dir); + snprintf (buf, PATH_MAX, "%s/.e_iconbar.bits.db", v->model->dir); ib->bit = ebits_load (buf); /* we didn't find one? */ if (!ib->bit) @@ -392,7 +391,7 @@ /* the path of the key to the image memebr - that is actually */ /* a lump of image data inlined in the iconbar db - so the icons */ /* themselves follow the iconbar wherever it goes */ - snprintf (buf, PATH_MAX, "%s/.e_iconbar.db:%s", ib->view->dir, + snprintf (buf, PATH_MAX, "%s/.e_iconbar.db:%s", ib->view->model->dir, ic->image_path); /* add the icon image object */ ic->image = evas_add_image_from_file (ib->view->evas, buf); @@ -655,43 +654,6 @@ } /** - * e_iconbar_file_add - Adds a file to a view - * @v: The view in which a file is added - * @file: Name of the added file - * - * This function is called from the - * view code whenever a file is added to a view. The iconbar code here - * determines if the file add is of interest - * and if it is, in 0.5 secs will do a "reload - */ -void -e_iconbar_file_add (E_View * v, char *file) -{ - D_ENTER; - - /* is the file of interest ? */ - if ((!strcmp (".e_iconbar.db", file)) || - (!strcmp (".e_iconbar.bits.db", file))) - { - char buf[PATH_MAX]; - - /* unique timer name */ - snprintf (buf, PATH_MAX, "iconbar_reload:%s", v->dir); - /* if we've scrolled or changed icons since. save */ - if (v->iconbar - && (v->iconbar->has_been_scrolled || v->iconbar->changed)) - { - e_iconbar_save_out_final (v->iconbar); - } - - /* in 0.5 secs call our timout handler */ - ecore_add_event_timer (buf, 0.5, ib_reload_timeout, 0, v); - } - - D_RETURN; -} - -/** * e_iconbar_file_delete - Function to remove a file from an iconbox. * @v: The view in which a file is removed * @file: Name of the removed file @@ -720,37 +682,6 @@ } /** - * e_iconbar_file_change - File change update function - * @v: The view in which a file changes - * @file: Name of the changed file - * - * This function gets called whenever a file changes in a view - */ -void -e_iconbar_file_change (E_View * v, char *file) -{ - D_ENTER; - - /* is the file that changed of interest */ - if ((!strcmp (".e_iconbar.db", file)) || - (!strcmp (".e_iconbar.bits.db", file))) - { - char buf[PATH_MAX]; - - /* unique timer name */ - snprintf (buf, PATH_MAX, "iconbar_reload:%s", v->dir); - /* if we've scrolled since. save */ - if (v->iconbar - && (v->iconbar->has_been_scrolled || v->iconbar->changed)) - e_iconbar_save_out_final (v->iconbar); - /* in 0.5 secs call the realod timeout */ - ecore_add_event_timer (buf, 0.5, ib_reload_timeout, 0, v); - } - - D_RETURN; -} - -/** * e_iconbar_save_out_final - save out final state of iconbar back to disk * @ib: The iconbar * @@ -766,11 +697,10 @@ if (ib->view) { E_DB_File *edb; - Imlib_Image im; Evas_List l; int i; - snprintf (buf, PATH_MAX, "%s/.e_iconbar.db", ib->view->dir); + snprintf (buf, PATH_MAX, "%s/.e_iconbar.db", ib->view->model->dir); D ("%s\n", buf); if (ib->changed) @@ -801,7 +731,7 @@ snprintf (buf2, PATH_MAX, "%s/.e_iconbar.db:/icons/%i/image", - ib->view->dir, i); + ib->view->model->dir, i); D ("save image\n"); imlib_save_image (buf2); } @@ -866,43 +796,6 @@ /* static (internal to iconbar use only) callbacks */ -/* reload timeout. called whenevr iconbar special files changed/added to */ -/* a view */ -static void -ib_reload_timeout (int val, void *data) -{ - E_View *v; - - D_ENTER; - - /* get our view pointer */ - v = (E_View *) data; -/* - D ("check if jsut saved:\n"); - if (v->iconbar->just_saved) - { - D ("just saved\n"); - v->iconbar->just_saved = 0; - D_RETURN; - } - */ - /* if we have an iconbar.. well nuke it */ - if (e_object_unref (E_OBJECT (v->iconbar)) == 0) - v->iconbar = NULL; - - /* try load a new iconbar */ - if (!v->iconbar) - v->iconbar = e_iconbar_new (v); - - /* if the iconbar loaded and theres an evas - we're realized */ - /* so realize the iconbar */ - if ((v->iconbar) && (v->evas)) - e_iconbar_realize (v->iconbar); - - D_RETURN; - UN (val); -} - /* scroll timeout. called to continuously scroll when arrow button down */ static void ib_scroll_timeout (int val, void *data) @@ -915,7 +808,7 @@ /* get our iconbar pointer */ ib = (E_Iconbar *) data; - snprintf (buf, PATH_MAX, "iconbar_scroll:%s", ib->view->dir); + snprintf (buf, PATH_MAX, "iconbar_scroll:%s", ib->view->name); if (val == 0) ecore_del_event_timer (buf); else @@ -975,7 +868,7 @@ /* figure out its path */ snprintf (buf, PATH_MAX, "%s/.e_iconbar.db:%s", - ic->iconbar->view->dir, ic->image_path); + ic->iconbar->view->model->dir, ic->image_path); /* add it */ ic->hi.image = evas_add_image_from_file (ic->iconbar->view->evas, buf); @@ -989,7 +882,7 @@ /* start at 0 */ val = 0; } - /* what tame is it ? */ + /* what time is it ? */ t = ecore_get_time (); if (ic->launch_id) { @@ -1312,7 +1205,7 @@ char buf[PATH_MAX]; /* come up with a unique name for it */ - snprintf (buf, PATH_MAX, "iconbar:%s/%s", ic->iconbar->view->dir, + snprintf (buf, PATH_MAX, "iconbar:%s/%s", ic->iconbar->view->name, ic->image_path); e_strdup (ic->hi.timer, buf); /* call the timeout */ @@ -1650,7 +1543,7 @@ ic->iconbar->changed = 1; e_iconbar_save_out_final(ic->iconbar); /* ic->iconbar->just_saved = 0;*/ - ib_reload_timeout(0, ic->iconbar->view); + e_view_ib_reload(ic->iconbar->view); } D_RETURN; @@ -1669,7 +1562,8 @@ D_ENTER; - D("add files: %s\n", source->dir); +#if 0 + D("add files: %s\n", source->model->dir); for (i = 0; i < num_files; i++) { char *file = e_file_get_file(strdup(dnd_files[i])); @@ -1681,7 +1575,6 @@ if (!strcmp(ic->info.mime.base, "db")) { /* if its an icon db, set the icon */ -#if 0 D("db!\n"); for (l = v->iconbar->icons; l; l = l->next) { @@ -1699,7 +1592,7 @@ v->iconbar->dnd.y < ibic->current.y + ibic->current.h ) { D("over icon: %s\n", ibic->exec); - snprintf(buf, PATH_MAX, "%s/%s:/icon/normal", ic->view->dir, ic->file); + snprintf(buf, PATH_MAX, "%s/%s:/icon/normal", ic->view->model->dir, ic->file); D("set icon: %s\n", buf); ibic->imlib_image = imlib_load_image(buf); @@ -1711,7 +1604,6 @@ } } break; -#endif } else if (e_file_can_exec (&ic->stat)) { @@ -1743,14 +1635,14 @@ else D("EEEEEEEEEEEEK: how the hell did this happen?"); - D("x: %i, v-dir: %s, ib-dir: %s\n", ibic->iconbar->icon_area.x, v->dir, ibic->iconbar->view->dir); + D("x: %f, v-dir: %s, ib-dir: %s\n", ibic->iconbar->icon_area.x, v->model->dir, ibic->iconbar->view->model->dir); - if (!ic->info.icon) D_RETURN_(NULL); + if (!ic->info.icon) D_RETURN; snprintf(buf, PATH_MAX, "%s:/icon/normal", ic->info.icon); ibic->image = evas_add_image_from_file (v->evas, buf); ibic->imlib_image = imlib_load_image (buf); ibic->image_path = strdup (ic->info.icon); - snprintf(buf, PATH_MAX, "%s/%s", ic->view->dir, ic->file); + snprintf(buf, PATH_MAX, "%s/%s", ic->view->model->dir, ic->file); ibic->exec = strdup(buf); evas_set_clip (v->evas, ibic->image, v->iconbar->clip); @@ -1774,6 +1666,7 @@ e_iconbar_icon_move(ibic, v->iconbar->dnd.x, v->iconbar->dnd.y); } +#endif } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/icons.c,v retrieving revision 1.30 retrieving revision 1.31 diff -u -3 -r1.30 -r1.31 --- icons.c 24 Jan 2002 06:15:40 -0000 1.30 +++ icons.c 25 Feb 2002 18:09:13 -0000 1.31 @@ -1,10 +1,13 @@ #include "view.h" #include "icons.h" #include "debug.h" -#include "globals.h" #include "cursors.h" #include "file.h" #include "util.h" +#include "e_view_model.h" +#include "e_file.h" +#include "e_view_machine.h" +#include "globals.h" static void e_icon_down_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y); static void e_icon_up_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y); @@ -174,14 +177,13 @@ E_Icon *ic; Ecore_Event *ev; Ecore_Event_Mouse_Move *e; - +#if 0 D_ENTER; ev = e_view_get_current_event(); if (!ev) D_RETURN; - e = ev->event; ic = _data; @@ -207,7 +209,7 @@ y = 999999999; xx = -999999999; yy = -999999999; - for (l = views; l; l = l->next) + for (l = VM->views; l; l = l->next) { E_View *v; Evas_List ll; @@ -282,7 +284,7 @@ imlib_context_set_cliprect(0, 0, 0, 0); imlib_context_set_angle(0); - for (l = views; l; l = l->next) + for (l = VM->views; l; l = l->next) { E_View *v; Evas_List ll; @@ -403,7 +405,7 @@ ecore_pointer_xy_get(&x, &y); ecore_window_dnd_handle_motion( ic->view->win.base, x, y, 1); } - +#endif D_RETURN; UN(_e); UN(_o); @@ -464,8 +466,8 @@ E_Icon *ic; ic = l->data; - if ((ic) && (ic->file) && (file) && (!strcmp(ic->file, file))) - D_RETURN_(ic); + if ((ic) && (ic->file->file) && (file) && (!strcmp(ic->file->file, file))) + D_RETURN_(ic); } D_RETURN_(NULL); } @@ -475,7 +477,6 @@ { D_ENTER; - if (ic->state.visible) D_RETURN; ic->state.visible = 1; if (!ic->obj.event1) @@ -577,7 +578,7 @@ { D_ENTER; - /* threse calc icon extents for: */ + /* these calc icon extents for: */ /* [I] */ /* Ig */ /* [txt] */ @@ -653,7 +654,8 @@ if ((ic->geom.x != ic->prev_geom.x) || (ic->geom.y != ic->prev_geom.y)) { ic->q.write_xy = 1; - e_view_queue_icon_xy_record(ic->view); + /* FIXME */ + //e_view_queue_icon_xy_record(ic->view); } if (ic->geom.x != ic->prev_geom.x) ic->view->extents.valid = 0; else if (ic->geom.y != ic->prev_geom.y) ic->view->extents.valid = 0; @@ -675,12 +677,12 @@ { D_ENTER; - if (!ic || !ic->info.mime.base || ic->stat.st_ino == 0) + if (!ic || !ic->file->info.mime.base || ic->file->stat.st_ino == 0) D_RETURN; - if (!strcmp(ic->info.mime.base, "dir")) + if (!strcmp(ic->file->info.mime.base, "dir")) { - if (e_file_can_exec(&ic->stat)) + if (e_file_can_exec(&ic->file->stat)) evas_set_color(ic->view->evas, ic->obj.icon, 255, 255, 255, 255); else evas_set_color(ic->view->evas, ic->obj.icon, 128, 128, 128, 128); @@ -694,11 +696,12 @@ e_icon_initial_show(E_Icon *ic) { D_ENTER; - + /* check if we have enuf info and we havent been shown yet */ - if (!ic->info.icon) D_RETURN; - if (ic->state.visible) D_RETURN; - + if ( !ic->file->info.icon || !ic->obj.icon + || ic->state.visible) + D_RETURN; + /* first. lets figure out the size of the icon */ evas_get_image_size(ic->view->evas, ic->obj.icon, &(ic->geom.icon.w), &(ic->geom.icon.h)); @@ -725,129 +728,29 @@ } void -e_icon_set_mime(E_Icon *ic, char *base, char *mime) -{ - int diff = 0; - - D_ENTER; - - if (!ic->info.mime.base) diff = 1; - if (!ic->info.mime.type) diff = 1; - if ((ic->info.mime.base) && (strcmp(ic->info.mime.base, base))) diff = 1; - if ((ic->info.mime.type) && (strcmp(ic->info.mime.base, mime))) diff = 1; - if (!diff) D_RETURN; - if (ic->info.mime.base) free(ic->info.mime.base); - if (ic->info.mime.type) free(ic->info.mime.type); - ic->info.mime.base = NULL; - ic->info.mime.type = NULL; - ic->info.mime.base = strdup(base); - ic->info.mime.type = strdup(mime); - - D("%40s: %s/%s\n", ic->file, base, mime); - - /* effect changes here */ - if (ic->info.custom_icon) - { - if (ic->info.icon) free(ic->info.icon); - ic->info.icon = NULL; - ic->info.icon = strdup(ic->info.custom_icon); - evas_set_image_file(ic->view->evas, ic->obj.icon, ic->info.custom_icon); - e_view_queue_resort(ic->view); - D_RETURN; - } - /* find an icon */ - { - char icon[PATH_MAX]; - char type[PATH_MAX]; - char *p; - int done = 0; - - strcpy(type, ic->info.mime.type); - for (p = type; *p; p++) - { - if (*p == '/') *p = '-'; - } - do - { - snprintf(icon, PATH_MAX, "%s/data/icons/%s/%s.db", PACKAGE_DATA_DIR, - ic->info.mime.base, type); - if (e_file_exists(icon)) - { - done = 1; - break; - } - p = strrchr(type, '-'); - if (p) *p = 0; - } - while (p); - if (!done) - { - if (!e_file_exists(icon)) - { - snprintf(icon, PATH_MAX, "%s/data/icons/%s/default.db", PACKAGE_DATA_DIR, - ic->info.mime.base); - if (!e_file_exists(icon)) - snprintf(icon, PATH_MAX, "%s/data/icons/unknown/default.db", PACKAGE_DATA_DIR); - } - } - ic->info.icon = strdup(icon); - } - - e_icon_update_state(ic); - - D_RETURN; -} - -void -e_icon_set_link(E_Icon *ic, char *link) -{ - D_ENTER; - - if ((!link) && (ic->info.link)) - { - free(ic->info.link); - ic->info.link = NULL; - /* effect changes here */ - } - else if (link) - { - if ((ic->info.link) && (!strcmp(ic->info.link, link))) - { - free(ic->info.link); - ic->info.link = strdup(link); - /* effect changes here */ - } - } - - D_RETURN; -} - - -void e_icon_update_state(E_Icon *ic) { char icon[PATH_MAX]; int iw, ih; int gw, gh; - D_ENTER; - - if (!ic->info.icon) + + if (!ic->file->info.icon) { - D("EEEEEEEEEEK %s has no icon\n", ic->file); + D("EEEEEEEEEEK %s has no icon\n", ic->file->file); D_RETURN; } if (ic->state.clicked) { - snprintf(icon, PATH_MAX, "%s:/icon/clicked", ic->info.icon); + snprintf(icon, PATH_MAX, "%s:/icon/clicked", ic->file->info.icon); } else if (ic->state.selected) { - snprintf(icon, PATH_MAX, "%s:/icon/selected", ic->info.icon); + snprintf(icon, PATH_MAX, "%s:/icon/selected", ic->file->info.icon); } else { - snprintf(icon, PATH_MAX, "%s:/icon/normal", ic->info.icon); + snprintf(icon, PATH_MAX, "%s:/icon/normal", ic->file->info.icon); } if ((ic->state.selected) && (!ic->obj.sel.under.icon) && @@ -899,8 +802,12 @@ ic->obj.sel.over.icon = NULL; ic->obj.sel.over.text = NULL; } + /* This relies on the obj.icon having been allocated in view_file_add. + * Maybe it would be better to allocate here, the first + * time the icon is set? -- till */ evas_set_image_file(ic->view->evas, ic->obj.icon, icon); - evas_get_image_size(ic->view->evas, ic->obj.icon, &iw, &ih); + evas_get_image_size(ic->view->evas, ic->obj.icon, &iw, &ih); + e_icon_check_permissions(ic); gw = ic->geom.icon.w; gh = ic->geom.icon.h; e_icon_apply_xy(ic); @@ -956,27 +863,29 @@ e_icon_exec(E_Icon *ic) { D_ENTER; - - if (!strcmp(ic->info.mime.base, "dir") && - e_file_can_exec(&ic->stat)) + + if (!strcmp(ic->file->info.mime.base, "dir") && + e_file_can_exec(&ic->file->stat)) { E_View *v; + E_Border *b; char buf[PATH_MAX]; - + v = e_view_new(); v->size.w = 400; v->size.h = 300; v->options.back_pixmap = 0; - snprintf(buf, PATH_MAX, "%s/%s", ic->view->dir, ic->file); + snprintf(buf, PATH_MAX, "%s/%s", ic->view->model->dir, ic->file->file); D("new dir >%s<\n", buf); - v->dir = strdup(buf); - e_view_bg_load(v); + e_view_set_dir(v, buf, 0); e_view_realize(v); - ecore_window_set_title(v->win.base, ic->file); + e_view_populate(v); + + e_view_bg_reload(v); + ecore_window_set_title(v->win.base, ic->file->file); ecore_window_set_name_class(v->win.base, "FileView", "E"); ecore_window_set_min_size(v->win.base, 8, 8); } - e_icon_deselect(ic); D_RETURN; =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/icons.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- icons.h 19 Dec 2001 03:30:47 -0000 1.3 +++ icons.h 25 Feb 2002 18:09:13 -0000 1.4 @@ -1,6 +1,7 @@ #ifndef E_ICONS_H #define E_ICONS_H +#include "e_file.h" #include "view.h" #include "text.h" @@ -17,21 +18,9 @@ struct _E_Icon { E_Object o; - - char *file; - struct stat stat; - + + E_File *file; E_View *view; - - struct { - char *icon; - char *custom_icon; - char *link; - struct { - char *base; - char *type; - } mime; - } info; struct { Evas_Object icon; =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/main.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -3 -r1.31 -r1.32 --- main.c 26 Nov 2001 01:10:48 -0000 1.31 +++ main.c 25 Feb 2002 18:09:13 -0000 1.32 @@ -15,6 +15,7 @@ #include "place.h" #include "iconbar.h" #include "util.h" +#include "e_view_machine.h" #ifdef USE_FERITE # include "e_ferite.h" @@ -140,12 +141,13 @@ ecore_ungrab(); /* Initialization for the various modules: */ + e_fs_init(); e_desktops_init(); e_border_init(); e_action_init(); e_menu_init(); - e_view_init(); + e_view_machine_init(); e_entry_init(); e_keys_init(); e_guides_init(); =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/resist.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- resist.c 4 Jan 2002 03:19:26 -0000 1.11 +++ resist.c 25 Feb 2002 18:09:13 -0000 1.12 @@ -49,7 +49,6 @@ /* here if need be - ie xinerama middle between screens and panels etc. */ { - E_View *v; if (b->desk->view->iconbar) evas_list_append(rects, e_iconbar_get_resist_rect(b->desk->view->iconbar)); } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/view.c,v retrieving revision 1.121 retrieving revision 1.122 diff -u -3 -r1.121 -r1.122 --- view.c 24 Feb 2002 06:48:14 -0000 1.121 +++ view.c 25 Feb 2002 18:09:13 -0000 1.122 @@ -10,9 +10,12 @@ #include "fs.h" #include "file.h" #include "util.h" -#include "globals.h" #include "icons.h" #include "epplet.h" +#include "e_view_model.h" +#include "e_view_machine.h" +#include "e_file.h" +#include "globals.h" static Ecore_Event *current_ev = NULL; @@ -49,15 +52,12 @@ static void e_dnd_drop_request(Ecore_Event * ev); static void e_dnd_drop_request_free(void); static void e_dnd_handle_drop( E_View *v ); -static void e_view_handle_fs(EfsdEvent *ev); -static void e_view_handle_fs_restart(void *data); static void e_view_resort_timeout(int val, void *data); static int e_view_restart_alphabetical_qsort_cb(const void *data1, const void *data2); static void e_view_geometry_record_timeout(int val, void *data); static void e_view_scrollbar_v_change_cb(void *_data, E_Scrollbar *sb, double val); static void e_view_scrollbar_h_change_cb(void *_data, E_Scrollbar *sb, double val); static void e_view_write_icon_xy_timeout(int val, void *data); -static void e_view_bg_reload_timeout(int val, void *data); static void e_view_write_icon_xy_timeout(int val, void *data) @@ -80,9 +80,10 @@ char buf[PATH_MAX]; ic->q.write_xy = 0; - snprintf(buf, PATH_MAX, "%s/%s", ic->view->dir, ic->file); + /* FIXME */ + snprintf(buf, PATH_MAX, "%s/%s", ic->view->model->dir, ic->file->file); - D("write meta xy for icon for file %s\n", ic->file); + D("write meta xy for icon for file %s\n", ic->file->file); efsd_set_metadata_int(e_fs_get_connection(), "/pos/x", buf, ic->geom.x); @@ -94,7 +95,7 @@ { char name[PATH_MAX]; - snprintf(name, PATH_MAX, "icon_xy_record.%s", v->dir); + snprintf(name, PATH_MAX, "icon_xy_record.%s", v->model->dir); ecore_add_event_timer(name, 0.01, e_view_write_icon_xy_timeout, 0, v); D_RETURN; } @@ -311,7 +312,7 @@ E_View *v; D_ENTER; - + if (!current_ev) D_RETURN; ev = current_ev->event; v = _data; @@ -538,7 +539,7 @@ D_ENTER; - for (ll = views; ll; ll = ll->next) + for (ll = VM->views; ll; ll = ll->next) { Evas_List l; E_View *v; @@ -563,7 +564,7 @@ D_ENTER; - for (ll = views; ll; ll = ll->next) + for (ll = VM->views; ll; ll = ll->next) { Evas_List l; E_View *v; @@ -792,10 +793,10 @@ D_ENTER; - for (l = views; l; l = l->next) + for (l = VM->views; l; l = l->next) { E_View *v; - + v = l->data; e_view_update(v); } @@ -817,22 +818,23 @@ ecore_window_get_frame_size(v->win.base, &left, NULL, &top, NULL); efsd_set_metadata_int(e_fs_get_connection(), - "/view/x", v->dir, + "/view/x", v->model->dir, v->location.x - left); efsd_set_metadata_int(e_fs_get_connection(), - "/view/y", v->dir, + "/view/y", v->model->dir, v->location.y - top); efsd_set_metadata_int(e_fs_get_connection(), - "/view/w", v->dir, + "/view/w", v->model->dir, v->size.w); efsd_set_metadata_int(e_fs_get_connection(), - "/view/h", v->dir, + "/view/h", v->model->dir, v->size.h); } D_RETURN; } + static void e_view_geometry_record_timeout(int val, void *data) { @@ -854,12 +856,13 @@ D_ENTER; - snprintf(name, PATH_MAX, "geometry_record.%s", v->dir); + snprintf(name, PATH_MAX, "geometry_record.%s", v->model->dir); ecore_add_event_timer(name, 0.10, e_view_geometry_record_timeout, 0, v); D_RETURN; } + void e_view_queue_icon_xy_record(E_View *v) { @@ -867,7 +870,7 @@ D_ENTER; - snprintf(name, PATH_MAX, "icon_xy_record.%s", v->dir); + snprintf(name, PATH_MAX, "icon_xy_record.%s", v->model->dir); ecore_add_event_timer(name, 0.10, e_view_write_icon_xy_timeout, 0, v); D_RETURN; @@ -881,9 +884,9 @@ Evas_List l; D_ENTER; - + e = ev->event; - for (l = views; l; l = l->next) + for (l = VM->views; l; l = l->next) { E_View *v; @@ -891,7 +894,7 @@ if (e->win == v->win.base) { /* win, root, x, y, w, h, wm_generated */ - D("configure for view %s\n", v->dir); + D("Configure for view: %s\n", v->name); if (e->wm_generated) { D("wm generated %i %i, %ix%i\n", e->x, e->y, e->w, e->h); @@ -900,7 +903,8 @@ D("new spot!\n"); v->location.x = e->x; v->location.y = e->y; - e_view_queue_geometry_record(v); + /* FIXME */ + //e_view_queue_geometry_record(v); } } D("size %ix%i\n", e->w, e->h); @@ -928,12 +932,12 @@ evas_set_output_size(v->evas, v->size.w, v->size.h); e_view_scroll_to(v, v->scroll.x, v->scroll.y); e_view_arrange(v); - e_view_queue_geometry_record(v); + /* FIXME */ + //e_view_queue_geometry_record(v); e_scrollbar_move(v->scrollbar.v, v->size.w - v->scrollbar.v->w, 0); e_scrollbar_resize(v->scrollbar.v, v->scrollbar.v->w, v->size.h - v->scrollbar.h->h); e_scrollbar_move(v->scrollbar.h, 0, v->size.h - v->scrollbar.h->h); e_scrollbar_resize(v->scrollbar.h, v->size.w - v->scrollbar.v->w, v->scrollbar.h->h); - if (v->iconbar) e_iconbar_fix(v->iconbar); } } } @@ -950,7 +954,7 @@ D_ENTER; e = ev->event; - for (l = views; l; l = l->next) + for (l = VM->views; l; l = l->next) { E_View *v; @@ -972,7 +976,7 @@ D_ENTER; e = ev->event; - for (l = views; l; l = l->next) + for (l = VM->views; l; l = l->next) { E_View *v; @@ -994,7 +998,7 @@ D_ENTER; e = ev->event; - for (l = views; l; l = l->next) + for (l = VM->views; l; l = l->next) { E_View *v; @@ -1016,7 +1020,7 @@ D_ENTER; e = ev->event; - for (l = views; l; l = l->next) + for (l = VM->views; l; l = l->next) { E_View *v; @@ -1038,7 +1042,7 @@ D_ENTER; e = ev->event; - for (l = views; l; l = l->next) + for (l = VM->views; l; l = l->next) { E_View *v; @@ -1060,7 +1064,7 @@ D_ENTER; e = ev->event; - for (l = views; l; l = l->next) + for (l = VM->views; l; l = l->next) { E_View *v; @@ -1099,7 +1103,7 @@ D_ENTER; e = ev->event; - for (l = views; l; l = l->next) + for (l = VM->views; l; l = l->next) { E_View *v; @@ -1140,7 +1144,7 @@ D_ENTER; e = ev->event; - for (l = views; l; l = l->next) + for (l = VM->views; l; l = l->next) { E_View *v; @@ -1162,7 +1166,7 @@ D_ENTER; e = ev->event; - for (l = views; l; l = l->next) + for (l = VM->views; l; l = l->next) { E_View *v; @@ -1215,7 +1219,7 @@ e = ev->event; D_RETURN; - for (l = views; l; l = l->next) + for (l = VM->views; l; l = l->next) { E_View *v; @@ -1235,7 +1239,7 @@ e = ev->event; current_ev = ev; - for (l = views; l; l = l->next) + for (l = VM->views; l; l = l->next) { E_View *v; @@ -1268,7 +1272,7 @@ e = ev->event; current_ev = ev; - for (l = views; l; l = l->next) + for (l = VM->views; l; l = l->next) { E_View *v; @@ -1295,7 +1299,7 @@ e = ev->event; current_ev = ev; - for (l = views; l; l = l->next) + for (l = VM->views; l; l = l->next) { E_View *v; @@ -1322,14 +1326,14 @@ e = ev->event; current_ev = ev; - for (l = views; l; l = l->next) + for (l = VM->views; l; l = l->next) { E_View *v; v = l->data; if (e->win == v->win.main) - { - if (v->is_desktop) + { + if (v->model->is_desktop) { evas_event_enter(v->evas); } @@ -1352,7 +1356,7 @@ e = ev->event; current_ev = ev; - for (l = views; l; l = l->next) + for (l = VM->views; l; l = l->next) { E_View *v; @@ -1378,7 +1382,7 @@ D_ENTER; e = ev->event; - for (l = views; l; l = l->next) + for (l = VM->views; l; l = l->next) { E_View *v; @@ -1395,66 +1399,6 @@ D_RETURN; } -static void -e_view_handle_fs_restart(void *data) -{ - E_View *v; - Evas_List icons = NULL, l; - - D_ENTER; - - v = data; - - D("e_view_handle_fs_restart\n"); - for (l = v->icons; l; l = l->next) - { - icons = evas_list_prepend(icons, l->data); - } - if (icons) - { - for (l = icons; l; l = l->next) - { - E_Icon *i; - - i = l->data; - e_view_file_deleted(v->monitor_id, i->file); - } - evas_list_free(icons); - } - if (e_fs_get_connection()) - { - if (v->geom_get.busy) - { - v->geom_get.x = efsd_get_metadata(e_fs_get_connection(), - "/view/x", v->dir, EFSD_INT); - v->geom_get.y = efsd_get_metadata(e_fs_get_connection(), - "/view/y", v->dir, EFSD_INT); - v->geom_get.w = efsd_get_metadata(e_fs_get_connection(), - "/view/w", v->dir, EFSD_INT); - v->geom_get.h = efsd_get_metadata(e_fs_get_connection(), - "/view/h", v->dir, EFSD_INT); - v->getbg = efsd_get_metadata(e_fs_get_connection(), - "/view/background", v->dir, EFSD_STRING); - } - { - EfsdOptions *ops; - - ops = efsd_ops(3, - efsd_op_get_stat(), - efsd_op_get_filetype(), - efsd_op_list_all()); - v->monitor_id = efsd_start_monitor(e_fs_get_connection(), v->dir, - ops, TRUE); - - } - v->is_listing = 1; - } - D("restarted monitor id (connection = %p), %i for %s\n", e_fs_get_connection(), v->monitor_id, v->dir); - v->is_listing = 1; - - D_RETURN; -} - Ecore_Event * e_view_get_current_event(void) { @@ -1467,7 +1411,7 @@ e_view_filter_file(E_View *v, char *file) { D_ENTER; - + if (file[0] == '.') D_RETURN_(0); @@ -1487,7 +1431,7 @@ ic = *((E_Icon **)data1); ic2 = *((E_Icon **)data2); - D_RETURN_(strcmp(ic->file, ic2->file)); + D_RETURN_(strcmp(ic->file->file, ic2->file->file)); } void @@ -1526,7 +1470,7 @@ double sv, sr, sm; D_ENTER; - + x = v->spacing.window.l; y = v->spacing.window.t; @@ -1607,157 +1551,20 @@ if (v->have_resort_queued) D_RETURN; v->have_resort_queued = 1; - snprintf(name, PATH_MAX, "resort_timer.%s", v->dir); + snprintf(name, PATH_MAX, "resort_timer.%s", v->name); ecore_add_event_timer(name, 1.0, e_view_resort_timeout, 0, v); D_RETURN; } - -void -e_view_file_added(int id, char *file) -{ - E_View *v; - - D_ENTER; - - /* if we get a path - ignore it - its not a file in the dir */ - if (!file) D_RETURN; - /* D("FILE ADD: %s\n", file);*/ - if (file[0] == '/') D_RETURN; - v = e_view_find_by_monitor_id(id); - if (!v) D_RETURN; - e_iconbar_file_add(v, file); - e_view_bg_add(v, file); - /* filter files here */ - if (!e_view_filter_file(v, file)) D_RETURN; - if (!e_icon_find_by_file(v, file)) - { - E_Icon *ic; - - ic = e_icon_new(); - ic->view = v; - ic->file = strdup(file); - ic->changed = 1; - ic->obj.icon = evas_add_image_from_file(ic->view->evas, NULL); - ic->obj.text = e_text_new(ic->view->evas, ic->file, "filename"); - v->icons = evas_list_append(v->icons, ic); - v->extents.valid = 0; - } - - D_RETURN; -} - -void -e_view_file_deleted(int id, char *file) -{ - E_View *v; - - D_ENTER; - - if (!file) D_RETURN; - if (file[0] == '/') D_RETURN; - v = e_view_find_by_monitor_id(id); - if (!v) D_RETURN; - e_iconbar_file_delete(v, file); - e_view_bg_del(v, file); - { - E_Icon *ic; - - ic = e_icon_find_by_file(v, file); - if (ic) - { - e_icon_hide(ic); - e_object_unref(E_OBJECT(ic)); - v->icons = evas_list_remove(v->icons, ic); - v->changed = 1; - v->extents.valid = 0; - e_view_queue_resort(v); - } - } - - D_RETURN; -} - -void -e_view_file_changed(int id, char *file) -{ - E_View *v; - - D_ENTER; - - D("file changed!!!\n"); - if (!file) D_RETURN; - if (file[0] == '/') D_RETURN; - v = e_view_find_by_monitor_id(id); - if (!v) D_RETURN; - e_iconbar_file_change(v, file); - e_view_bg_change(v, file); - { - E_Icon *ic; - - ic = e_icon_find_by_file(v, file); - if (ic) - { - } - } - - D_RETURN; -} - -void -e_view_file_moved(int id, char *file) -{ - E_View *v; - - D_ENTER; - - /* never gets called ? */ - if (!file) D_RETURN; - D(".!WOW!. e_view_file_moved(%i, %s);\n", id, file); - if (file[0] == '/') D_RETURN; - v = e_view_find_by_monitor_id(id); - if (!v) D_RETURN; - - { - E_Icon *ic; - - ic = e_icon_find_by_file(v, file); - if (ic) - { - } - } - - D_RETURN; -} - -E_View * -e_view_find_by_monitor_id(int id) -{ - Evas_List l; - - D_ENTER; - - for (l = views; l; l = l->next) - { - E_View *v; - - v = l->data; - if (v->monitor_id == id) - D_RETURN_(v); - } - - D_RETURN_(NULL); -} - E_View * e_view_find_by_window(Window win) { Evas_List l; D_ENTER; - - for (l = views; l; l = l->next) + + for (l = VM->views; l; l = l->next) { E_View *v; @@ -1774,11 +1581,11 @@ { D_ENTER; - while (views) + while (VM->views) { E_View *v; - v = views->data; + v = VM->views->data; e_object_unref(E_OBJECT(v)); } @@ -1789,36 +1596,29 @@ e_view_cleanup(E_View *v) { char name[PATH_MAX]; - D_ENTER; + /* write geometry to metadata. This is done directly and + * not via a timeout, because we will destroy the object after this.*/ + e_view_geometry_record(v); + e_view_machine_unregister_view(v); + if (v->iconbar) - { - e_iconbar_save_out_final(v->iconbar); - e_object_unref(E_OBJECT(v->iconbar)); - } + { + e_iconbar_save_out_final(v->iconbar); + e_object_unref(E_OBJECT(v->iconbar)); + } if (v->scrollbar.h) e_object_unref(E_OBJECT(v->scrollbar.h)); if (v->scrollbar.v) e_object_unref(E_OBJECT(v->scrollbar.v)); - - snprintf(name, PATH_MAX, "resort_timer.%s", v->dir); - ecore_del_event_timer(name); - snprintf(name, PATH_MAX, "geometry_record.%s", v->dir); - ecore_del_event_timer(name); - snprintf(name, PATH_MAX, "icon_xy_record.%s", v->dir); - ecore_del_event_timer(name); - - views = evas_list_remove(views, v); - efsd_stop_monitor(e_fs_get_connection(), v->dir, TRUE); - if (v->restarter) - e_fs_del_restart_handler(v->restarter); - v->restarter = NULL; ecore_window_destroy(v->win.base); - /* FIXME: clean up the rest!!! this leaks ... */ + snprintf(name, PATH_MAX, "resort_timer.%s", v->name); + ecore_del_event_timer(name); + /* FIXME: clean up the rest!!! this leaks ... */ + /* Call the destructor of the base class */ e_object_cleanup(E_OBJECT(v)); - D_RETURN; } @@ -1875,8 +1675,8 @@ v->spacing.icon.g = 7; v->spacing.icon.b = 7; + e_view_machine_register_view(v); - views = evas_list_append(views, v); D_RETURN_(v); } @@ -1891,48 +1691,25 @@ } void -e_view_set_dir(E_View *v, char *dir) +e_view_set_dir(E_View *v, char *dir, int is_desktop) { D_ENTER; - - /* stop monitoring old dir */ - if ((v->dir) && (v->monitor_id)) - { - efsd_stop_monitor(e_fs_get_connection(), v->dir, TRUE); - v->monitor_id = 0; - } - IF_FREE(v->dir); - v->dir = e_file_realpath(dir); - /* start monitoring new dir */ - v->restarter = e_fs_add_restart_handler(e_view_handle_fs_restart, v); - if (e_fs_get_connection()) - { - v->geom_get.x = efsd_get_metadata(e_fs_get_connection(), - "/view/x", v->dir, EFSD_INT); - v->geom_get.y = efsd_get_metadata(e_fs_get_connection(), - "/view/y", v->dir, EFSD_INT); - v->geom_get.w = efsd_get_metadata(e_fs_get_connection(), - "/view/w", v->dir, EFSD_INT); - v->geom_get.h = efsd_get_metadata(e_fs_get_connection(), - "/view/h", v->dir, EFSD_INT); - v->getbg = efsd_get_metadata(e_fs_get_connection(), - "/view/background", v->dir, EFSD_STRING); - v->geom_get.busy = 1; - { - EfsdOptions *ops; - - ops = efsd_ops(3, - efsd_op_get_stat(), - efsd_op_get_filetype(), - efsd_op_list_all()); - v->monitor_id = efsd_start_monitor(e_fs_get_connection(), v->dir, - ops, TRUE); - } - D("monitor id for %s = %i\n", v->dir, v->monitor_id); - v->is_listing = 1; - v->changed = 1; - } - + e_view_machine_get_model(v, dir, is_desktop); + /* Request metadata via efsd */ + v->geom_get.x = efsd_get_metadata(e_fs_get_connection(), + "/view/x", v->model->dir, EFSD_INT); + v->geom_get.y = efsd_get_metadata(e_fs_get_connection(), + "/view/y", v->model->dir, EFSD_INT); + v->geom_get.w = efsd_get_metadata(e_fs_get_connection(), + "/view/w", v->model->dir, EFSD_INT); + v->geom_get.h = efsd_get_metadata(e_fs_get_connection(), + "/view/h", v->model->dir, EFSD_INT); + /* FIXME currently, we dont use this anyway */ +/* + * v->getbg = efsd_get_metadata(e_fs_get_connection(), + * "/view/background", v->model->dir, EFSD_STRING); + */ + v->geom_get.busy = 1; D_RETURN; } @@ -1943,9 +1720,8 @@ int font_cache = 1024 * 1024; int image_cache = 8192 * 1024; char *font_dir; - + D_ENTER; - if (v->evas) D_RETURN; v->win.base = ecore_window_new(0, v->location.x, v->location.y, @@ -2019,67 +1795,85 @@ ecore_window_show(v->win.main); - { - char *dir; - - dir = v->dir; - v->dir = NULL; - e_view_set_dir(v, dir); - IF_FREE(dir); - } - if (!v->iconbar) v->iconbar = e_iconbar_new(v); if (v->iconbar) { e_iconbar_realize(v->iconbar); e_iconbar_set_view_window_spacing(v->iconbar); } - + + e_view_bg_reload(v); e_epplet_load_from_layout(v); v->changed = 1; - D_RETURN; } void +e_view_populate(E_View *v) +{ + Evas_List l; + /* populate with icons for all files in the dir we are monitoring. + * This has to be called _after_ view_realize because + * view_add_file needs the evas to be intialized */ + for (l=v->model->files;l;l=l->next) + { + E_File *f = (E_File*) l->data; + E_Icon *ic; + e_view_file_add(v, f); + /* try to show the icons for the file. If this is not the first for + * the dir this will succeed because filetype and stat info have + * already been received. If not, it'll be shown when those arrive. */ + ic = e_icon_find_by_file(v, f->file); + if (ic) + { + e_icon_update_state(ic); + e_icon_initial_show(ic); + } + } +} + +void e_view_update(E_View *v) { Evas_List l; D_ENTER; - - if (v->changed) - { - if(v->drag.icon_hide) - { - for (l = v->icons; l; l = l->next) - { - E_Icon *ic; - - ic = l->data; - e_icon_hide_delete_pending(ic); - } - v->drag.icon_hide = 0; - v_dnd_source = v; - } - if(v->drag.icon_show) - { - for (l = v->icons; l; l = l->next) - { - E_Icon *ic; - - ic = l->data; - e_icon_show_delete_end(ic, dnd_pending_mode); - } - dnd_pending_mode = E_DND_NONE; - v->drag.icon_show = 0; - } - if (v->drag.update) - { - ecore_window_move(v->drag.win, v->drag.x, v->drag.y); - v->drag.update = 0; - } - } + + /* FIXME find all places where setting the dirty flag is needed */ +/* + * if (!v->changed) + * D_RETURN; + */ + + if(v->drag.icon_hide) + { + for (l = v->icons; l; l = l->next) + { + E_Icon *ic; + + ic = l->data; + e_icon_hide_delete_pending(ic); + } + v->drag.icon_hide = 0; + v_dnd_source = v; + } + if(v->drag.icon_show) + { + for (l = v->icons; l; l = l->next) + { + E_Icon *ic; + + ic = l->data; + e_icon_show_delete_end(ic, dnd_pending_mode); + } + dnd_pending_mode = E_DND_NONE; + v->drag.icon_show = 0; + } + if (v->drag.update) + { + ecore_window_move(v->drag.win, v->drag.x, v->drag.y); + v->drag.update = 0; + } if (v->options.back_pixmap) { Imlib_Updates up; @@ -2103,504 +1897,150 @@ } else evas_render(v->evas); + v->changed = 0; D_RETURN; } - -static void -e_view_handle_fs(EfsdEvent *ev) +void +e_view_file_add(E_View *v, E_File *f) { D_ENTER; - - switch (ev->type) - { - case EFSD_EVENT_FILECHANGE: - switch (ev->efsd_filechange_event.changetype) - { - case EFSD_FILE_CREATED: -/* D("EFSD_FILE_CREATED: %i %s\n", - ev->efsd_filechange_event.id, - ev->efsd_filechange_event.file); -*/ e_view_file_added(ev->efsd_filechange_event.id, - ev->efsd_filechange_event.file); - break; - case EFSD_FILE_EXISTS: - /* D("EFSD_FILE_EXISTS: %i %s\n", - ev->efsd_filechange_event.id, - ev->efsd_filechange_event.file); */ - e_view_file_added(ev->efsd_filechange_event.id, - ev->efsd_filechange_event.file); - break; - case EFSD_FILE_DELETED: -/* D("EFSD_FILE_DELETED: %i %s\n", - ev->efsd_filechange_event.id, - ev->efsd_filechange_event.file); -*/ e_view_file_deleted(ev->efsd_filechange_event.id, - ev->efsd_filechange_event.file); - break; - case EFSD_FILE_CHANGED: -/* D("EFSD_CHANGE_CHANGED: %i %s\n", - ev->efsd_filechange_event.id, - ev->efsd_filechange_event.file); -*/ e_view_file_changed(ev->efsd_filechange_event.id, - ev->efsd_filechange_event.file); - break; - case EFSD_FILE_MOVED: -/* D("EFSD_CHANGE_MOVED: %i %s\n", - ev->efsd_filechange_event.id, - ev->efsd_filechange_event.file); -*/ e_view_file_moved(ev->efsd_filechange_event.id, - ev->efsd_filechange_event.file); - break; - case EFSD_FILE_END_EXISTS: - { - E_View *v; - - v = e_view_find_by_monitor_id(efsd_event_id(ev)); - if (v) v->is_listing = 0; -/* D("EFSD_CHANGE_END_EXISTS: %i %s\n", - ev->efsd_filechange_event.id, - ev->efsd_filechange_event.file); -*/ } - break; - default: - break; - } - break; - case EFSD_EVENT_REPLY: - switch (ev->efsd_reply_event.command.type) - { - case EFSD_CMD_REMOVE: - break; - case EFSD_CMD_MOVE: - break; - case EFSD_CMD_SYMLINK: - break; - case EFSD_CMD_LISTDIR: - break; - case EFSD_CMD_MAKEDIR: - break; - case EFSD_CMD_CHMOD: - break; - case EFSD_CMD_GETFILETYPE: - /* D("Getmime event %i\n", - ev->efsd_reply_event.command.efsd_file_cmd.id); */ - if (ev->efsd_reply_event.errorcode == 0) - { - E_Icon *ic; - E_View *v; - char *file; - - file = NULL; - if ( (file = efsd_event_filename(ev)) ) - { - file = e_file_get_file(file); - } - v = e_view_find_by_monitor_id(efsd_event_id(ev)); - if ((v) && (file)) - { - ic = e_icon_find_by_file(v, file); - if ((ic) && - (ev->efsd_reply_event.data)) - { - char *m, *p; - char mime[PATH_MAX], base[PATH_MAX]; - - m = ev->efsd_reply_event.data; - p = strchr(m, '/'); - if (p) - { - strcpy(base, m); - strcpy(mime, p + 1); - p = strchr(base, '/'); - *p = 0; - } - else - { - strcpy(base, m); - strcpy(mime, "unknown"); - } -/* D("MIME: %s\n", m); -*/ e_icon_set_mime(ic, base, mime); - - /* Try to update the GUI according to the file permissions. - It's just a try because we need to have the file's stat - info as well. --cK. - */ - e_icon_check_permissions(ic); - e_icon_initial_show(ic); - } - } - } - break; - case EFSD_CMD_STAT: - /* D("Stat event %i on %s\n", - efsd_reply_id(ev), efsd_reply_filename(ev)); */ - - /* When everything went okay and we can find a view and an icon, - set the file stat data for the icon. Then try to check the - permissions and possibly update the gui. It's just a try - because we need to have received the filetype info too. --cK. - */ - if (ev->efsd_reply_event.errorcode == 0) - { - E_Icon *ic; - E_View *v; - - v = e_view_find_by_monitor_id(efsd_event_id(ev)); - - if (v) - { - ic = e_icon_find_by_file(v, e_file_get_file(efsd_event_filename(ev))); + if (!e_icon_find_by_file(v, f->file)) + { + E_Icon *ic; - if (ic) - { - ic->stat = *((struct stat*)efsd_event_data(ev)); - e_icon_check_permissions(ic); - } - } - } - break; - case EFSD_CMD_READLINK: - if (ev->efsd_reply_event.errorcode == 0) - { - E_Icon *ic; - E_View *v; - - char *file; - - file = NULL; - if ( (file = efsd_event_filename(ev)) ) - { - file = e_file_get_file(file); - } - v = e_view_find_by_monitor_id(efsd_event_id(ev)); - if ((v) && (file)) - { - ic = e_icon_find_by_file(v, file); - if ((ic) && - (ev->efsd_reply_event.data)) - e_icon_set_link(ic, (char*)efsd_event_data(ev)); - e_icon_initial_show(ic); - } - } - break; - case EFSD_CMD_CLOSE: - break; - case EFSD_CMD_SETMETA: - break; - case EFSD_CMD_GETMETA: - /* D("Getmeta event %i\n", - efsd_reply_id(ev));*/ - { - Evas_List l; - EfsdCmdId cmd; - - cmd = efsd_event_id(ev); - for (l = views; l; l = l->next) - { - E_View *v; - int ok; - - ok = 0; - v = l->data; - if (v->is_desktop) continue; - if (v->geom_get.x == cmd) - { - v->geom_get.x = 0; - if (efsd_metadata_get_type(ev) == EFSD_INT) - { - if (ev->efsd_reply_event.errorcode == 0) - { - if (efsd_metadata_get_int(ev, - &(v->location.x))) - { - ecore_window_move(v->win.base, - v->location.x, - v->location.y); - ecore_window_set_xy_hints(v->win.base, - v->location.x, - v->location.y); - } - } - } - ok = 1; - } - else if (v->geom_get.y == cmd) - { - v->geom_get.y = 0; - if (efsd_metadata_get_type(ev) == EFSD_INT) - { - if (ev->efsd_reply_event.errorcode == 0) - { - if (efsd_metadata_get_int(ev, - &(v->location.y))) - { - ecore_window_move(v->win.base, - v->location.x, - v->location.y); - ecore_window_set_xy_hints(v->win.base, - v->location.x, - v->location.y); - } - } - } - ok = 1; - } - else if (v->geom_get.w == cmd) - { - v->geom_get.w = 0; - if (efsd_metadata_get_type(ev) == EFSD_INT) - { - if (ev->efsd_reply_event.errorcode == 0) - { - if (efsd_metadata_get_int(ev, - &(v->size.w))) - { - ecore_window_resize(v->win.base, - v->size.w, - v->size.h); - v->size.force = 1; - } - } - } - ok = 1; - } - else if (v->geom_get.h == cmd) - { - v->geom_get.h = 0; - if (efsd_metadata_get_type(ev) == EFSD_INT) - { - if (ev->efsd_reply_event.errorcode == 0) - { - if (efsd_metadata_get_int(ev, - &(v->size.h))) - { - ecore_window_resize(v->win.base, - v->size.w, - v->size.h); - v->size.force = 1; - } - } - } - ok = 1; - } - else if (v->getbg == cmd) - { - v->getbg = 0; - if (efsd_metadata_get_type(ev) == EFSD_STRING) - { - if (ev->efsd_reply_event.errorcode == 0) - { - char buf[PATH_MAX]; - - IF_FREE(v->bg_file); - e_strdup(v->bg_file, efsd_metadata_get_str(ev)); - snprintf(buf, PATH_MAX, "background_reload:%s", v->dir); - ecore_add_event_timer(buf, 0.5, e_view_bg_reload_timeout, 0, v); - } - } - } - if (ok) - { - if ((!v->geom_get.x) && - (!v->geom_get.y) && - (!v->geom_get.w) && - (!v->geom_get.h) && - (v->geom_get.busy)) - { - E_Border *b; - - v->geom_get.busy = 0; - if (v->bg) - e_bg_resize(v->bg, v->size.w, v->size.h); - if (v->options.back_pixmap) e_view_update(v); - b = e_border_adopt(v->win.base, 1); - b->client.internal = 1; - e_border_remove_click_grab(b); - } - D_RETURN; - } - } - } - break; - case EFSD_CMD_STARTMON_DIR: -/* D("Startmon event %i\n", - ev->efsd_reply_event.command.efsd_file_cmd.id); -*/ break; - case EFSD_CMD_STARTMON_FILE: -/* D("Startmon file event %i\n", - ev->efsd_reply_event.command.efsd_file_cmd.id); -*/ break; - case EFSD_CMD_STOPMON_DIR: - break; - case EFSD_CMD_STOPMON_FILE: - break; - default: - break; - } - break; - default: - break; - } + ic = e_icon_new(); + ic->view = v; + ic->file = f; + ic->changed = 1; + /* this basically allocates the obj.icon struct. Its image will be + * set later in icon_update_state */ + ic->obj.icon = evas_add_image_from_file(ic->view->evas, NULL); + ic->obj.text = e_text_new(ic->view->evas, f->file, "filename"); + v->icons = evas_list_append(v->icons, ic); + v->extents.valid = 0; + } + e_view_queue_resort(v); + v->changed = 1; D_RETURN; } void -e_view_bg_load(E_View *v) +e_view_file_changed(E_View *v, E_File *f) { - E_Background bg; - char buf[PATH_MAX]; - - D_ENTER; - - if (!v->prev_bg_file) - { - e_strdup(v->prev_bg_file, "/"); - } - if (!v->bg_file) - { - e_strdup(v->bg_file, ""); - } - else - { - /* relative path for bg_file ? */ - if ((v->bg_file[0] != '/')) - { - snprintf(buf, PATH_MAX, "%s/%s", v->dir, v->bg_file); - FREE(v->bg_file); - e_strdup(v->bg_file, buf); - } - } - bg = e_bg_load(v->bg_file); - if (!bg) - { - snprintf(buf, PATH_MAX, "%s/.e_background.bg.db", v->dir); - FREE(v->bg_file); - e_strdup(v->bg_file, buf); - bg = e_bg_load(v->bg_file); - if (!bg) - { - if (v->is_desktop) - snprintf(buf, PATH_MAX, "%s/default.bg.db", e_config_get("backgrounds")); - else - snprintf(buf, PATH_MAX, "%s/view.bg.db", e_config_get("backgrounds")); - FREE(v->bg_file); - e_strdup(v->bg_file, buf); - bg = e_bg_load(v->bg_file); - } - } - if (bg) - { - v->bg = bg; - v->bg_mod = e_file_mod_time(v->bg_file); - if (v->evas) - { - e_bg_add_to_evas(v->bg, v->evas); - e_bg_set_scroll(v->bg, v->scroll.x, v->scroll.y); - e_bg_set_layer(v->bg, 100); - e_bg_resize(v->bg, v->size.w, v->size.h); - - e_bg_callback_add(v->bg, CALLBACK_MOUSE_UP, e_bg_up_cb, v); - e_bg_callback_add(v->bg, CALLBACK_MOUSE_DOWN, e_bg_down_cb, v); - e_bg_callback_add(v->bg, CALLBACK_MOUSE_MOVE, e_bg_move_cb, v); - - e_bg_show(v->bg); - } - } - - IF_FREE(v->prev_bg_file); - e_strdup(v->prev_bg_file, v->bg_file); - - D_RETURN; -} - -static void -e_view_bg_reload_timeout(int val, void *data) -{ - E_View *v; - + E_Icon *ic; D_ENTER; - - v = data; - if (!strcmp(v->prev_bg_file, v->bg_file)) - { - time_t new_mod; - - new_mod = e_file_mod_time(v->bg_file); - if (new_mod == v->bg_mod) - { - D("abort bg reload - same damn file\n"); - D_RETURN; - } - } - if (v->bg) - { - int size; - - e_bg_free(v->bg); - v->bg = NULL; - if (v->evas) - { - size = evas_get_image_cache(v->evas); - evas_set_image_cache(v->evas, 0); - evas_set_image_cache(v->evas, size); - } - e_db_flush(); - } - - e_view_bg_load(v); + ic = e_icon_find_by_file(v, f->file); + if (ic) + { + } D_RETURN; - UN(val); } void -e_view_bg_change(E_View *v, char *file) +e_view_file_delete(E_View *v, E_File *f) { - char buf[PATH_MAX]; - + E_Icon *ic; D_ENTER; - if (!(!strcmp(file, ".e_background.bg.db"))) return; - snprintf(buf, PATH_MAX, "background_reload:%s", v->dir); - ecore_add_event_timer(buf, 0.5, e_view_bg_reload_timeout, 0, v); + e_iconbar_file_delete(v, f->file); + ic = e_icon_find_by_file(v, f->file); + if (ic) + { + e_icon_hide(ic); + e_object_unref(E_OBJECT(ic)); + v->icons = evas_list_remove(v->icons, ic); + v->changed = 1; + v->extents.valid = 0; + e_view_queue_resort(v); + } D_RETURN; } void -e_view_bg_add(E_View *v, char *file) +e_view_ib_reload (E_View *v) { - char buf[PATH_MAX]; - - D_ENTER; + D_ENTER; - if (!(!strcmp(file, ".e_background.bg.db"))) return; - snprintf(buf, PATH_MAX, "%s/%s", v->dir, file); - if (!strcmp(buf, v->bg_file)) D_RETURN; - IF_FREE(v->bg_file); - e_strdup(v->bg_file, ""); - snprintf(buf, PATH_MAX, "background_reload:%s", v->dir); - ecore_add_event_timer(buf, 0.5, e_view_bg_reload_timeout, 0, v); + /* + D ("check if jsut saved:\n"); + if (v->iconbar->just_saved) + { + D ("just saved\n"); + v->iconbar->just_saved = 0; + D_RETURN; + } + */ + /* if we have an iconbar.. well nuke it */ + if (e_object_unref (E_OBJECT (v->iconbar)) == 0) + v->iconbar = NULL; + + /* try load a new iconbar */ + if (!v->iconbar) + v->iconbar = e_iconbar_new (v); + + /* if the iconbar loaded and theres an evas - we're realized */ + /* so realize the iconbar */ + if ((v->iconbar) && (v->evas)) + e_iconbar_realize (v->iconbar); - D_RETURN; + D_RETURN; } void -e_view_bg_del(E_View *v, char *file) +e_view_bg_reload(E_View *v) { + E_Background bg; + + /* This should only be called if the background did really + * change in the underlying model. We dont check again + * here. */ D_ENTER; + + if (v->bg) + { + int size; - e_view_bg_change(v, file); + e_bg_free(v->bg); + v->bg = NULL; + if (v->evas) + { + size = evas_get_image_cache(v->evas); + evas_set_image_cache(v->evas, 0); + evas_set_image_cache(v->evas, size); + } + e_db_flush(); + } + + bg = e_bg_load(v->model->bg_file); + + if (bg) + { + v->bg = bg; + if (v->evas) + { + e_bg_add_to_evas(v->bg, v->evas); + e_bg_set_scroll(v->bg, v->scroll.x, v->scroll.y); + e_bg_set_layer(v->bg, 100); + e_bg_resize(v->bg, v->size.w, v->size.h); + + e_bg_callback_add(v->bg, CALLBACK_MOUSE_UP, e_bg_up_cb, v); + e_bg_callback_add(v->bg, CALLBACK_MOUSE_DOWN, e_bg_down_cb, v); + e_bg_callback_add(v->bg, CALLBACK_MOUSE_MOVE, e_bg_move_cb, v); + e_bg_show(v->bg); + } + } D_RETURN; } + void e_view_init(void) { @@ -2632,7 +2072,6 @@ ecore_event_filter_handler_add(ECORE_EVENT_DND_DROP_REQUEST, e_dnd_drop_request); ecore_event_filter_idle_handler_add(e_idle, NULL); - e_fs_add_event_handler(e_view_handle_fs); D_RETURN; } @@ -2656,10 +2095,15 @@ * Atom destination_atom; * } Ecore_Event_Dnd_Data_Request; */ - Evas_List l; + Evas_List l; + E_View *v; + Evas_List ll; + char *data = NULL; D_ENTER; - + /* Me, my... [truncated message content] |
From: <enl...@li...> - 2002-02-25 18:09:38
|
Enlightenment CVS committal Author : tillsan Project : e17 Module : apps/e Dir : e17/apps/e/po Modified Files: ChangeLog Makefile.in.in Log Message: and this one too ;) =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/po/ChangeLog,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- ChangeLog 2 Nov 2001 17:07:52 -0000 1.8 +++ ChangeLog 25 Feb 2002 18:09:36 -0000 1.9 @@ -1,3 +1,23 @@ +2002-02-24 gettextize <bug...@gn...> + + * Makefile.in.in: Upgrade to gettext-0.10.40. + +2002-02-22 gettextize <bug...@gn...> + + * Makefile.in.in: Upgrade to gettext-0.10.40. + +2002-02-16 gettextize <bug...@gn...> + + * Makefile.in.in: Upgrade to gettext-0.10.40. + +2002-02-15 gettextize <bug...@gn...> + + * Makefile.in.in: Upgrade to gettext-0.10.40. + +2002-02-15 gettextize <bug...@gn...> + + * Makefile.in.in: Upgrade to gettext-0.10.40. + 2001-10-22 gettextize <bug...@gn...> * Makefile.in.in: Upgrade to gettext-0.10.39. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/po/Makefile.in.in,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- Makefile.in.in 4 Nov 2001 07:38:42 -0000 1.4 +++ Makefile.in.in 25 Feb 2002 18:09:36 -0000 1.5 @@ -1,14 +1,18 @@ # Makefile for program source directory in GNU NLS utilities package. -# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <dr...@gn...> +# Copyright (C) 1995-1997, 2000, 2001 by Ulrich Drepper <dr...@gn...> # # This file file be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License +# be used in projects which are not available under the GNU General Public License # but which still want to provide support for the GNU gettext functionality. # Please note that the actual code is *not* freely available. PACKAGE = @PACKAGE@ VERSION = @VERSION@ +# These two variables depend on the location of this directory. +subdir = po +top_builddir = .. + SHELL = /bin/sh @SET_MAKE@ @@ -18,24 +22,20 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ -datadir = $(prefix)/@DATADIRNAME@ +datadir = @datadir@ localedir = $(datadir)/locale -gnulocaledir = $(prefix)/share/locale -gettextsrcdir = $(prefix)/share/gettext/po -subdir = po - -DESTDIR = +gettextsrcdir = $(datadir)/gettext/po INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ -MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac` CC = @CC@ -GENCAT = @GENCAT@ -GMSGFMT = PATH=../src:$$PATH @GMSGFMT@ +GMSGFMT = @GMSGFMT@ MSGFMT = @MSGFMT@ -XGETTEXT = PATH=../src:$$PATH @XGETTEXT@ -MSGMERGE = PATH=../src:$$PATH msgmerge +XGETTEXT = @XGETTEXT@ +MSGMERGE = msgmerge DEFS = @DEFS@ CFLAGS = @CFLAGS@ @@ -45,20 +45,17 @@ COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) -SOURCES = cat-id-tbl.c POFILES = @POFILES@ GMOFILES = @GMOFILES@ DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \ -stamp-cat-id $(POFILES) $(GMOFILES) $(SOURCES) +$(POFILES) $(GMOFILES) POTFILES = \ CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -INSTOBJEXT = @INSTOBJEXT@ .SUFFIXES: -.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat +.SUFFIXES: .c .o .po .pox .gmo .mo .c.o: $(COMPILE) $< @@ -72,19 +69,19 @@ .po.gmo: file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ - && rm -f $$file && $(GMSGFMT) -o $$file $< - -.po.cat: - sed -f ../intl/po2msg.sed < $< > $*.msg \ - && rm -f $@ && $(GENCAT) $@ $*.msg + && rm -f $$file && $(GMSGFMT) --statistics -o $$file $< all: all-@USE_NLS@ -all-yes: cat-id-tbl.c $(CATALOGS) +all-yes: $(CATALOGS) all-no: -$(srcdir)/$(PACKAGE).pot: $(POTFILES) +# Note: Target 'all' must not depend on target '$(srcdir)/$(PACKAGE).pot', +# otherwise packages like GCC can not be built if only parts of the source +# have been downloaded. + +$(srcdir)/$(PACKAGE).pot: $(POTFILES) $(srcdir)/POTFILES.in $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \ --add-comments --keyword=_ --keyword=N_ \ --files-from=$(srcdir)/POTFILES.in \ @@ -92,78 +89,35 @@ || ( rm -f $(srcdir)/$(PACKAGE).pot \ && mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot ) -$(srcdir)/cat-id-tbl.c: stamp-cat-id; @: -$(srcdir)/stamp-cat-id: $(PACKAGE).pot - rm -f cat-id-tbl.tmp - sed -f ../intl/po2tbl.sed $(srcdir)/$(PACKAGE).pot \ - | sed -e "s/@PACKAGE NAME@/$(PACKAGE)/" > cat-id-tbl.tmp - if cmp -s cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; then \ - rm cat-id-tbl.tmp; \ - else \ - echo cat-id-tbl.c changed; \ - rm -f $(srcdir)/cat-id-tbl.c; \ - mv cat-id-tbl.tmp $(srcdir)/cat-id-tbl.c; \ - fi - cd $(srcdir) && rm -f stamp-cat-id && echo timestamp > stamp-cat-id - install: install-exec install-data install-exec: install-data: install-data-@USE_NLS@ -install-data-no: all -install-data-yes: all - if test -r "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ + if test "$(PACKAGE)" = "gettext"; then \ + $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ + $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ + $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \ + : ; \ fi +install-data-no: all +install-data-yes: all + $(mkinstalldirs) $(DESTDIR)$(datadir) @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ - case "$$cat" in \ - *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \ - *) destdir=$(DESTDIR)$(localedir);; \ - esac; \ - lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ - dir=$$destdir/$$lang/LC_MESSAGES; \ - if test -r "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $$dir; \ - else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \ - fi; \ + lang=`echo $$cat | sed 's/\.gmo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ + $(mkinstalldirs) $(DESTDIR)$$dir; \ if test -r $$cat; then \ - $(INSTALL_DATA) $$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \ - echo "installing $$cat as $$dir/$(PACKAGE)$(INSTOBJEXT)"; \ + $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \ + echo "installing $$cat as $(DESTDIR)$$dir/$(PACKAGE).mo"; \ else \ - $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(PACKAGE)$(INSTOBJEXT); \ + $(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \ echo "installing $(srcdir)/$$cat as" \ - "$$dir/$(PACKAGE)$(INSTOBJEXT)"; \ - fi; \ - if test -r $$cat.m; then \ - $(INSTALL_DATA) $$cat.m $$dir/$(PACKAGE)$(INSTOBJEXT).m; \ - echo "installing $$cat.m as $$dir/$(PACKAGE)$(INSTOBJEXT).m"; \ - else \ - if test -r $(srcdir)/$$cat.m ; then \ - $(INSTALL_DATA) $(srcdir)/$$cat.m \ - $$dir/$(PACKAGE)$(INSTOBJEXT).m; \ - echo "installing $(srcdir)/$$cat as" \ - "$$dir/$(PACKAGE)$(INSTOBJEXT).m"; \ - else \ - true; \ - fi; \ + "$(DESTDIR)$$dir/$(PACKAGE).mo"; \ fi; \ done - if test "$(PACKAGE)" = "gettext"; then \ - if test -r "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \ - else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \ - fi; \ - $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ - $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ - else \ - : ; \ - fi # Define this as empty until I found a useful application. installcheck: @@ -172,76 +126,68 @@ catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ - lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ - rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \ - rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \ - rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT); \ - rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(PACKAGE)$(INSTOBJEXT).m; \ + lang=`echo $$cat | sed 's/\.gmo$$//'`; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \ done - rm -f $(DESTDIR)$(gettextsrcdir)/po-Makefile.in.in + if test "$(PACKAGE)" = "gettext"; then \ + rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ + else \ + : ; \ + fi check: all -cat-id-tbl.o: ../intl/libgettext.h - dvi info tags TAGS ID: mostlyclean: - rm -f core core.* *.pox $(PACKAGE).po *.old.po cat-id-tbl.tmp + rm -f core core.* *.pox $(PACKAGE).po *.new.po rm -fr *.o clean: mostlyclean distclean: clean - rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m + rm -f Makefile Makefile.in POTFILES *.mo maintainer-clean: distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." rm -f $(GMOFILES) -distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) -dist distdir: update-po $(DISTFILES) +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) +dist distdir: + $(MAKE) update-po + @$(MAKE) dist2 +# This is a separate target because 'update-po' must be executed before. +dist2: $(DISTFILES) dists="$(DISTFILES)"; \ for file in $$dists; do \ - ln $(srcdir)/$$file $(distdir) 2> /dev/null \ - || cp -p $(srcdir)/$$file $(distdir); \ + if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ + cp -p $$dir/$$file $(distdir); \ done update-po: Makefile $(MAKE) $(PACKAGE).pot - PATH=`pwd`/../src:$$PATH; \ + if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \ cd $(srcdir); \ - catalogs='$(CATALOGS)'; \ + catalogs='$(GMOFILES)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ - lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ - mv $$lang.po $$lang.old.po; \ + lang=`echo $$cat | sed 's/\.gmo$$//'`; \ echo "$$lang:"; \ - if $(MSGMERGE) $$lang.old.po $(PACKAGE).pot -o $$lang.po; then \ - rm -f $$lang.old.po; \ + if $(MSGMERGE) $$lang.po $(PACKAGE).pot -o $$lang.new.po; then \ + mv -f $$lang.new.po $$lang.po; \ else \ echo "msgmerge for $$cat failed!"; \ - rm -f $$lang.po; \ - mv $$lang.old.po $$lang.po; \ + rm -f $$lang.new.po; \ fi; \ done + $(MAKE) update-gmo -POTFILES: POTFILES.in - ( if test 'x$(srcdir)' != 'x.'; then \ - posrcprefix='$(top_srcdir)/'; \ - else \ - posrcprefix="../"; \ - fi; \ - rm -f $@-t $@ \ - && (sed -e '/^#/d' -e '/^[ ]*$$/d' \ - -e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \ - | sed -e '$$s/\\$$//') > $@-t \ - && chmod a-w $@-t \ - && mv $@-t $@ ) +update-gmo: Makefile $(GMOFILES) + @: -Makefile: Makefile.in.in ../config.status POTFILES - cd .. \ +Makefile: Makefile.in.in $(top_builddir)/config.status POTFILES.in + cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ $(SHELL) ./config.status |
From: <enl...@li...> - 2002-02-25 18:10:08
|
Enlightenment CVS committal Author : tillsan Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: ChangeLog Log Message: and this one too ;) =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/ChangeLog,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- ChangeLog 8 Dec 2000 22:54:41 -0000 1.1 +++ ChangeLog 25 Feb 2002 18:09:36 -0000 1.2 @@ -0,0 +1,9 @@ +Mon Feb 25 18:56:35 2002 Till Adam <ti...@ad...> + * start of ChangeLog ;) + * several views of the same dir are now possible + * added class E_File representing a file with stat and icon info + * added class E_View_Model representing a dir with list of E_Files + * added singleton E_View_Machine holding global lists of Views and + View_Models + * seperation of icon and file concepts + * various small fixes and cleanups |
From: <enl...@li...> - 2002-02-25 20:45:00
|
Enlightenment CVS committal Author : tillsan Project : e17 Module : apps/e Dir : e17/apps/e/src Modified Files: e_view_model.h view.h Log Message: update some docu and comments =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/e_view_model.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_view_model.h 25 Feb 2002 18:09:12 -0000 1.1 +++ e_view_model.h 25 Feb 2002 20:44:58 -0000 1.2 @@ -38,10 +38,21 @@ int is_desktop; }; +/** + * e_view_model_set_dir - Assigns a directory to a view model + * @m: The view model to set the dir for + * @dir: The directory + * + * Set the directory for a view_model and starts monitoring it via efsd. + */ void e_view_model_set_dir(E_View_Model *m, char *dir); + E_View_Model * e_view_model_new(); void e_view_model_init(); + E_View_Model * e_view_model_find_by_monitor_id(int id); + +/* Deal with incoming file events */ void e_view_model_file_added(int id, char *file); void e_view_model_file_deleted(int id, char *file); void e_view_model_file_changed(int id, char *file); =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/view.h,v retrieving revision 1.33 retrieving revision 1.34 diff -u -3 -r1.33 -r1.34 --- view.h 25 Feb 2002 18:09:13 -0000 1.33 +++ view.h 25 Feb 2002 20:44:58 -0000 1.34 @@ -219,21 +219,24 @@ /** * e_view_set_dir - Sets view to a given directory - * @v The view for which to set the directory - * @dir The directory to set the view to + * @v The view for which to set the directory + * @dir The directory to set the view to + * @is_desktop Inidicates wether the view is a desktop * * This function sets a view to a directory, loading the - * view's metadata (view window coordinates etc) from that - * directory, it also requests monitoring of the files in - * the directory @dir from efsd. + * view's metadata (view window coordinates etc). If a view_model already + * exists for this dir, it is reused, otherwise a new on is created. */ void e_view_set_dir(E_View *v, char *dir, int is_desktop); /** * e_view_populate - Draws icons for all files in view * @v The view to populate + * + * Goes through the list of files in the underlying view_model and calls + * view_add_file for each one. This results in icons being created for each + * file. */ - void e_view_populate(E_View *v); /** @@ -241,12 +244,18 @@ * @v: The view to initialize * * This function initializes a created view by loading - * all the graphics, and sets the view to a given directory - * by calling e_view_set_dir(). + * all the graphics and creating the evas. */ void e_view_realize(E_View *v); +/** + * e_view_update - Redraws a view + * @v: The view to redraw + * + * If the contents of the view have changed, this function redraws it. + */ void e_view_update(E_View *v); + void e_view_bg_reload(E_View *v); void e_view_ib_reload(E_View *v); |
From: <enl...@li...> - 2002-02-26 09:24:51
|
Enlightenment CVS committal Author : tillsan Project : e17 Module : apps/e Dir : e17/apps/e/src Modified Files: icons.c Log Message: re-enable drag and drop. Turned out to need only minimal adjustments. Not extensively tested, so I'd appreciate it if people tried if this works like before. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/icons.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -3 -r1.31 -r1.32 --- icons.c 25 Feb 2002 18:09:13 -0000 1.31 +++ icons.c 26 Feb 2002 09:24:50 -0000 1.32 @@ -177,7 +177,6 @@ E_Icon *ic; Ecore_Event *ev; Ecore_Event_Mouse_Move *e; -#if 0 D_ENTER; ev = e_view_get_current_event(); @@ -308,22 +307,22 @@ &ix, &iy, NULL, NULL); icx = ix + v->location.x - wx; icy = iy + v->location.y - wy; - if (!ic->info.icon) + if (!ic->file->info.icon) { - D("EEEEEEEEEEK %s has no icon\n", ic->file); + D("EEEEEEEEEEK %s has no icon\n", ic->file->file); D_RETURN; } if (ic->state.clicked) { - snprintf(icon, PATH_MAX, "%s:/icon/clicked", ic->info.icon); + snprintf(icon, PATH_MAX, "%s:/icon/clicked", ic->file->info.icon); } else if (ic->state.selected) { - snprintf(icon, PATH_MAX, "%s:/icon/selected", ic->info.icon); + snprintf(icon, PATH_MAX, "%s:/icon/selected", ic->file->info.icon); } else { - snprintf(icon, PATH_MAX, "%s:/icon/normal", ic->info.icon); + snprintf(icon, PATH_MAX, "%s:/icon/normal", ic->file->info.icon); } im2 = imlib_load_image(icon); if (im2) @@ -405,7 +404,6 @@ ecore_pointer_xy_get(&x, &y); ecore_window_dnd_handle_motion( ic->view->win.base, x, y, 1); } -#endif D_RETURN; UN(_e); UN(_o); |
From: <enl...@li...> - 2002-02-26 09:25:21
|
Enlightenment CVS committal Author : tillsan Project : e17 Module : apps/e Dir : e17/apps/e/po Modified Files: ChangeLog Log Message: re-enable drag and drop. Turned out to need only minimal adjustments. Not extensively tested, so I'd appreciate it if people tried if this works like before. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/po/ChangeLog,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- ChangeLog 25 Feb 2002 18:09:36 -0000 1.9 +++ ChangeLog 26 Feb 2002 09:24:47 -0000 1.10 @@ -1,3 +1,7 @@ +2002-02-26 gettextize <bug...@gn...> + + * Makefile.in.in: Upgrade to gettext-0.10.40. + 2002-02-24 gettextize <bug...@gn...> * Makefile.in.in: Upgrade to gettext-0.10.40. |
From: <enl...@li...> - 2002-02-26 18:56:56
|
Enlightenment CVS committal Author : tillsan Project : e17 Module : apps/e Dir : e17/apps/e/src Modified Files: view.c Log Message: This is meant to prevent drags from one view of a dir to another view of the same dir. Kevin, is this the right place to do this? =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/view.c,v retrieving revision 1.123 retrieving revision 1.124 diff -u -3 -r1.123 -r1.124 --- view.c 26 Feb 2002 01:25:35 -0000 1.123 +++ view.c 26 Feb 2002 18:56:54 -0000 1.124 @@ -2350,8 +2350,8 @@ if (e->win == v->win.base) { /* Dropped! Handle data */ - /* Same view? Mark to skip action */ - if( e->win == e->source_win ) + /* Same view or same underlying dir? Mark to skip action */ + if( e->win == e->source_win || v->model == v_dnd_source->model) v->drag.matching_drop_attempt = 1; /* Perform the action... */ e_dnd_handle_drop (v); |
From: <enl...@li...> - 2002-02-26 21:12:48
|
Enlightenment CVS committal Author : tillsan Project : e17 Module : apps/e Dir : e17/apps/e/src Modified Files: e_view_machine.c e_view_model.c iconbar.c icons.c view.c view.h Log Message: - use the view->changed flag again and set it whenever necessary (I hope ;) - hopefully fix core on bsd reported by kirby kuehl =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/e_view_machine.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_view_machine.c 25 Feb 2002 18:09:12 -0000 1.1 +++ e_view_machine.c 26 Feb 2002 21:12:45 -0000 1.2 @@ -11,6 +11,8 @@ D_ENTER; /* FIXME make this a singleton */ VM= NEW(E_View_Model, 1); + VM->views = NULL; + VM->models = NULL; e_view_init(); e_view_model_init(); D_RETURN; =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/e_view_model.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_view_model.c 25 Feb 2002 18:09:12 -0000 1.1 +++ e_view_model.c 26 Feb 2002 21:12:45 -0000 1.2 @@ -397,6 +397,7 @@ ecore_window_move(v->win.base, v->location.x, v->location.y); ecore_window_resize(v->win.base, v->size.w, v->size.h); v->size.force = 1; + v->changed = 1; /* We have received all metadata we need, display the view */ if ((!v->geom_get.x) && =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/iconbar.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -3 -r1.24 -r1.25 --- iconbar.c 25 Feb 2002 18:09:12 -0000 1.24 +++ iconbar.c 26 Feb 2002 21:12:45 -0000 1.25 @@ -1764,7 +1764,5 @@ else ib->view->spacing.window.b = (ib->view->size.h - y) / 2 + 15; } - - D_RETURN; } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/icons.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -3 -r1.32 -r1.33 --- icons.c 26 Feb 2002 09:24:50 -0000 1.32 +++ icons.c 26 Feb 2002 21:12:45 -0000 1.33 @@ -730,7 +730,6 @@ { char icon[PATH_MAX]; int iw, ih; - int gw, gh; D_ENTER; if (!ic->file->info.icon) @@ -806,11 +805,11 @@ evas_set_image_file(ic->view->evas, ic->obj.icon, icon); evas_get_image_size(ic->view->evas, ic->obj.icon, &iw, &ih); e_icon_check_permissions(ic); - gw = ic->geom.icon.w; - gh = ic->geom.icon.h; e_icon_apply_xy(ic); - if ((iw == gw) && (ih == gh)) D_RETURN; - e_view_queue_resort(ic->view); + ic->view->changed = 1; + + if ((iw != ic->geom.icon.w) || (ih != ic->geom.icon.h)) + e_view_queue_resort(ic->view); D_RETURN; } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/view.c,v retrieving revision 1.124 retrieving revision 1.125 diff -u -3 -r1.124 -r1.125 --- view.c 26 Feb 2002 18:56:54 -0000 1.124 +++ view.c 26 Feb 2002 21:12:45 -0000 1.125 @@ -235,6 +235,7 @@ evas_del_object(v->evas, v->select.obj.grad_b); evas_del_object(v->evas, v->select.obj.clip); v->select.obj.middle = NULL; + v->changed = 1; D_RETURN; } if (!v->select.on) D_RETURN; @@ -272,7 +273,7 @@ evas_show(v->evas, v->select.obj.grad_t); evas_show(v->evas, v->select.obj.grad_b); evas_show(v->evas, v->select.obj.clip); - + v->changed = 1; D_RETURN; } @@ -1512,6 +1513,7 @@ if (sr < sm) e_scrollbar_show(v->scrollbar.h); else e_scrollbar_hide(v->scrollbar.h); + v->changed = 1; D_RETURN; } @@ -1680,16 +1682,6 @@ } void -e_view_set_background(E_View *v) -{ - D_ENTER; - - v->changed = 1; - - D_RETURN; -} - -void e_view_set_dir(E_View *v, char *dir, int is_desktop) { D_ENTER; @@ -1838,11 +1830,8 @@ D_ENTER; - /* FIXME find all places where setting the dirty flag is needed */ -/* - * if (!v->changed) - * D_RETURN; - */ + if (!v->changed) + D_RETURN; if(v->drag.icon_hide) { @@ -1938,6 +1927,7 @@ if (ic) { } + v->changed = 1; D_RETURN; } @@ -2036,6 +2026,7 @@ e_bg_show(v->bg); } } + v->changed = 1; D_RETURN; } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/view.h,v retrieving revision 1.34 retrieving revision 1.35 diff -u -3 -r1.34 -r1.35 --- view.h 25 Feb 2002 20:44:58 -0000 1.34 +++ view.h 26 Feb 2002 21:12:45 -0000 1.35 @@ -215,8 +215,6 @@ */ E_View *e_view_new(void); -void e_view_set_background(E_View *v); - /** * e_view_set_dir - Sets view to a given directory * @v The view for which to set the directory |
From: <enl...@li...> - 2002-02-27 10:39:09
|
Enlightenment CVS committal Author : tillsan Project : e17 Module : apps/e Dir : e17/apps/e/src Modified Files: icons.c view.c view.h Log Message: prevent selections in multiple views of the same dir. I do it like this to keep selection info out of the view_model because it really doesnt belong there, I think. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/icons.c,v retrieving revision 1.33 retrieving revision 1.34 diff -u -3 -r1.33 -r1.34 --- icons.c 26 Feb 2002 21:12:45 -0000 1.33 +++ icons.c 27 Feb 2002 10:39:08 -0000 1.34 @@ -829,7 +829,21 @@ void e_icon_select(E_Icon *ic) { + Evas_List l; D_ENTER; + if (ic->view->select.lock) + D_RETURN; + if (ic->view->select.count == 0) + { + /* lock all other views of our dir */ + for (l= ic->view->model->views;l;l=l->next) + { + E_View *v = (E_View *) l->data; + v->select.lock = 1; + } + /* unlock ourselves */ + ic->view->select.lock = 0; + } if (!ic->state.selected) { @@ -844,7 +858,10 @@ void e_icon_deselect(E_Icon *ic) { + Evas_List l; D_ENTER; + if (ic->view->select.lock) + D_RETURN; if (ic->state.selected) { @@ -852,7 +869,16 @@ ic->view->select.count--; e_icon_update_state(ic); } - + if (ic->view->select.count == 0) + { + /* we have just unselected the last icon. Unlock all + * other views of our model. */ + for (l= ic->view->model->views;l;l=l->next) + { + E_View *v = (E_View *) l->data; + v->select.lock = 0; + } + } D_RETURN; } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/view.c,v retrieving revision 1.125 retrieving revision 1.126 diff -u -3 -r1.125 -r1.126 --- view.c 26 Feb 2002 21:12:45 -0000 1.125 +++ view.c 27 Feb 2002 10:39:08 -0000 1.126 @@ -1652,6 +1652,7 @@ v->options.back_pixmap = 0; #endif #endif + v->select.lock = 0; v->select.config.grad_size.l = 8; v->select.config.grad_size.r = 8; v->select.config.grad_size.t = 8; =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/view.h,v retrieving revision 1.35 retrieving revision 1.36 diff -u -3 -r1.35 -r1.36 --- view.h 26 Feb 2002 21:12:45 -0000 1.35 +++ view.h 27 Feb 2002 10:39:08 -0000 1.36 @@ -49,7 +49,7 @@ char * name; E_View_Model *model; - + struct { Evas_Render_Method render_method; int back_pixmap; @@ -94,6 +94,9 @@ } spacing; struct { int on; + /* we set this in all other views of our view_model + * when the first icon in a view is selected. */ + int lock; /* The number of selected icons. */ int count; /* The number of icons we selected the last time. |
From: <enl...@li...> - 2002-02-27 22:46:16
|
Enlightenment CVS committal Author : tillsan Project : e17 Module : apps/e Dir : e17/apps/e/src Modified Files: border.c e_view_machine.c e_view_machine.h icons.c view.c Log Message: Move e_view_machine_get_model functionality into e_view_set_dir in view.c where it makes more sense. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/border.c,v retrieving revision 1.68 retrieving revision 1.69 diff -u -3 -r1.68 -r1.69 --- border.c 28 Jan 2002 05:41:29 -0000 1.68 +++ border.c 27 Feb 2002 22:46:14 -0000 1.69 @@ -728,56 +728,51 @@ static void e_mouse_in(Ecore_Event * ev) { - Ecore_Event_Window_Enter *e; - - D_ENTER; + Ecore_Event_Window_Enter *e; + E_Border *b; + D_ENTER; current_ev = ev; e = ev->event; - { - E_Border *b; - - b = e_border_find_by_window(e->win); - if (b) - { - if (e->win == b->win.main) e_cb_border_mouse_in(b, ev); - if (e->win == b->win.input) - { - int x, y; - Evas evas; - - evas = b->evas.l; - ecore_window_get_root_relative_location(evas_get_window(evas), &x, &y); - x = e->rx - x; - y = e->ry - y; - evas_event_move(evas, x, y); - evas_event_enter(evas); - - evas = b->evas.r; - ecore_window_get_root_relative_location(evas_get_window(evas), &x, &y); - x = e->rx - x; - y = e->ry - y; - evas_event_move(evas, x, y); - evas_event_enter(evas); - - evas = b->evas.t; - ecore_window_get_root_relative_location(evas_get_window(evas), &x, &y); - x = e->rx - x; - y = e->ry - y; - evas_event_move(evas, x, y); - evas_event_enter(evas); - - evas = b->evas.b; - ecore_window_get_root_relative_location(evas_get_window(evas), &x, &y); - x = e->rx - x; - y = e->ry - y; - evas_event_move(evas, x, y); - evas_event_enter(evas); - } - } - } + if ( (b = e_border_find_by_window(e->win)) ) + { + if (e->win == b->win.main) + e_cb_border_mouse_in(b, ev); + else if (e->win == b->win.input) + { + int x, y; + Evas evas; + + evas = b->evas.l; + ecore_window_get_root_relative_location(evas_get_window(evas), &x, &y); + x = e->rx - x; + y = e->ry - y; + evas_event_move(evas, x, y); + evas_event_enter(evas); + + evas = b->evas.r; + ecore_window_get_root_relative_location(evas_get_window(evas), &x, &y); + x = e->rx - x; + y = e->ry - y; + evas_event_move(evas, x, y); + evas_event_enter(evas); + + evas = b->evas.t; + ecore_window_get_root_relative_location(evas_get_window(evas), &x, &y); + x = e->rx - x; + y = e->ry - y; + evas_event_move(evas, x, y); + evas_event_enter(evas); + + evas = b->evas.b; + ecore_window_get_root_relative_location(evas_get_window(evas), &x, &y); + x = e->rx - x; + y = e->ry - y; + evas_event_move(evas, x, y); + evas_event_enter(evas); + } + } current_ev = NULL; - D_RETURN; } @@ -808,7 +803,6 @@ } } current_ev = NULL; - current_ev = NULL; D_RETURN; } @@ -818,15 +812,14 @@ e_window_expose(Ecore_Event * ev) { Ecore_Event_Window_Expose *e; - + D_ENTER; current_ev = ev; e = ev->event; { Evas_List l; - E_Border *b; - + E_Border *b; for (l = evases; l; l = l->next) { Evas evas; =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/e_view_machine.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_view_machine.c 27 Feb 2002 21:06:42 -0000 1.3 +++ e_view_machine.c 27 Feb 2002 22:46:14 -0000 1.4 @@ -44,8 +44,8 @@ } -static E_View_Model * -view_model_lookup(char *path) +E_View_Model * +e_view_machine_model_lookup(char *path) { E_View_Model *m; Evas_List l; @@ -77,54 +77,4 @@ } -void -e_view_machine_get_model(E_View *v, char *path, int is_desktop) -{ - E_View_Model *m = NULL; - char buf[PATH_MAX]; - - D_ENTER; - - if (!v || !path || *path == 0) - D_RETURN; - - if (!(m = view_model_lookup(path))) - { - D("Model for this dir doesn't exist, make a new one\n"); - - m = e_view_model_new(); - VM->models = evas_list_append(VM->models, m); - e_view_model_set_dir(m, path); - - snprintf(buf, PATH_MAX, "%s/.e_background.bg.db", m->dir); - if (!e_file_exists(buf)) - { - if (is_desktop) - { - snprintf(buf, PATH_MAX, "%s/default.bg.db", e_config_get("backgrounds")); - } - else - { - snprintf(buf, PATH_MAX, "%s/view.bg.db", e_config_get("backgrounds")); - } - } - e_strdup(m->bg_file, buf); - m->is_desktop = is_desktop; - } - - if (m) - { - v->model = m; - v->model->views = evas_list_append(v->model->views, v); - /* FIXME do a real naming scheme here */ - snprintf(buf, PATH_MAX, "%s:%d", v->model->dir, e_object_get_usecount(E_OBJECT(v->model))); - e_strdup(v->name, buf); - D("assigned name to view: %s\n",v->name); - } - else - { - /* FIXME error handling */ - } - D_RETURN; -} =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/e_view_machine.h,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_view_machine.h 27 Feb 2002 21:06:42 -0000 1.2 +++ e_view_machine.h 27 Feb 2002 22:46:14 -0000 1.3 @@ -12,5 +12,5 @@ void e_view_machine_init(void); void e_view_machine_register_view(E_View *v); void e_view_machine_unregister_view(E_View *v); -void e_view_machine_get_model(E_View *v, char *path, int is_desktop); +E_View_Model *e_view_machine_model_lookup(char *path); #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/icons.c,v retrieving revision 1.34 retrieving revision 1.35 diff -u -3 -r1.34 -r1.35 --- icons.c 27 Feb 2002 10:39:08 -0000 1.34 +++ icons.c 27 Feb 2002 22:46:14 -0000 1.35 @@ -891,7 +891,6 @@ e_file_can_exec(&ic->file->stat)) { E_View *v; - E_Border *b; char buf[PATH_MAX]; v = e_view_new(); @@ -910,6 +909,6 @@ ecore_window_set_min_size(v->win.base, 8, 8); } e_icon_deselect(ic); - + D_RETURN; } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/view.c,v retrieving revision 1.126 retrieving revision 1.127 diff -u -3 -r1.126 -r1.127 --- view.c 27 Feb 2002 10:39:08 -0000 1.126 +++ view.c 27 Feb 2002 22:46:14 -0000 1.127 @@ -1683,25 +1683,69 @@ } void -e_view_set_dir(E_View *v, char *dir, int is_desktop) +e_view_set_dir(E_View *v, char *path, int is_desktop) { + E_View_Model *m = NULL; + char buf[PATH_MAX]; + D_ENTER; - e_view_machine_get_model(v, dir, is_desktop); - /* Request metadata via efsd */ - v->geom_get.x = efsd_get_metadata(e_fs_get_connection(), - "/view/x", v->model->dir, EFSD_INT); - v->geom_get.y = efsd_get_metadata(e_fs_get_connection(), - "/view/y", v->model->dir, EFSD_INT); - v->geom_get.w = efsd_get_metadata(e_fs_get_connection(), - "/view/w", v->model->dir, EFSD_INT); - v->geom_get.h = efsd_get_metadata(e_fs_get_connection(), - "/view/h", v->model->dir, EFSD_INT); - /* FIXME currently, we dont use this anyway */ -/* - * v->getbg = efsd_get_metadata(e_fs_get_connection(), - * "/view/background", v->model->dir, EFSD_STRING); - */ - v->geom_get.busy = 1; + + if (!v || !path || *path == 0) + D_RETURN; + + if (!(m = e_view_machine_model_lookup(path))) + { + D("Model for this dir doesn't exist, make a new one\n"); + + m = e_view_model_new(); + VM->models = evas_list_append(VM->models, m); + e_view_model_set_dir(m, path); + + snprintf(buf, PATH_MAX, "%s/.e_background.bg.db", m->dir); + if (!e_file_exists(buf)) + { + if (is_desktop) + { + snprintf(buf, PATH_MAX, "%s/default.bg.db", e_config_get("backgrounds")); + } + else + { + snprintf(buf, PATH_MAX, "%s/view.bg.db", e_config_get("backgrounds")); + } + } + e_strdup(m->bg_file, buf); + m->is_desktop = is_desktop; + } + + if (m) + { + v->model = m; + v->model->views = evas_list_append(v->model->views, v); + /* FIXME do a real naming scheme here */ + snprintf(buf, PATH_MAX, "%s:%d", v->model->dir, e_object_get_usecount(E_OBJECT(v->model))); + e_strdup(v->name, buf); + D("assigned name to view: %s\n",v->name); + + /* Request metadata via efsd */ + v->geom_get.x = efsd_get_metadata(e_fs_get_connection(), + "/view/x", v->model->dir, EFSD_INT); + v->geom_get.y = efsd_get_metadata(e_fs_get_connection(), + "/view/y", v->model->dir, EFSD_INT); + v->geom_get.w = efsd_get_metadata(e_fs_get_connection(), + "/view/w", v->model->dir, EFSD_INT); + v->geom_get.h = efsd_get_metadata(e_fs_get_connection(), + "/view/h", v->model->dir, EFSD_INT); + /* FIXME currently, we dont use this anyway */ + /* + * v->getbg = efsd_get_metadata(e_fs_get_connection(), + * "/view/background", v->model->dir, EFSD_STRING); + */ + v->geom_get.busy = 1; + } + else + { + /* FIXME error handling */ + } D_RETURN; } |
From: <enl...@li...> - 2002-03-01 16:30:14
|
Enlightenment CVS committal Author : tillsan Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: ChangeLog Log Message: and that =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/ChangeLog,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- ChangeLog 1 Mar 2002 00:52:44 -0000 1.3 +++ ChangeLog 1 Mar 2002 16:30:11 -0000 1.4 @@ -1,3 +1,9 @@ +Fri Mar 01 17:27:18 2002 Till Adam <ti...@ad...> + * dnd operations now only affect the currently focused view + +Thu Feb 28 18:45:12 CST 2002 Corey Donohoe <at...@at...> + * Free bgs in e_view_cleanup, it might still be leaking elsewhere though + Mon Feb 25 18:56:35 2002 Till Adam <ti...@ad...> * start of ChangeLog ;) * several views of the same dir are now possible @@ -7,5 +13,3 @@ View_Models * seperation of icon and file concepts * various small fixes and cleanups -Thu Feb 28 18:45:12 CST 2002 Corey Donohoe <at...@at...> - * Free bgs in e_view_cleanup, it might still be leaking elsewhere though |
From: <enl...@li...> - 2002-03-01 16:31:32
|
Enlightenment CVS committal Author : tillsan Project : e17 Module : apps/e Dir : e17/apps/e/src Modified Files: icons.c view.c view.h Log Message: * dnd operations now only affect the currently focused view =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/icons.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -3 -r1.35 -r1.36 --- icons.c 27 Feb 2002 22:46:14 -0000 1.35 +++ icons.c 1 Mar 2002 16:31:28 -0000 1.36 @@ -172,238 +172,241 @@ } static void +_paint_selected_icons_onto_drag_window(E_View *v, Imlib_Image im, int wx, int wy) +{ + Evas_List l; + D_ENTER; + + if (!v || !im || v->select.count <= 0) + D_RETURN; + + /* paint all selected icons onto the invisible drag window */ + for (l = v->icons; l; l = l->next) + { + double ix, iy; + int icx, icy; + Imlib_Image im2; + char icon[PATH_MAX]; + E_Icon *ic; + + ic = l->data; + if (!ic->state.selected) + continue; + + evas_get_geometry(ic->view->evas, + ic->obj.icon, + &ix, &iy, NULL, NULL); + icx = ix + v->location.x - wx; + icy = iy + v->location.y - wy; + if (!ic->file->info.icon) + { + D("EEEEEEEEEEK %s has no icon\n", ic->file->file); + D_RETURN; + } + if (ic->state.clicked) + { + snprintf(icon, PATH_MAX, "%s:/icon/clicked", ic->file->info.icon); + } + else if (ic->state.selected) + { + snprintf(icon, PATH_MAX, "%s:/icon/selected", ic->file->info.icon); + } + else + { + snprintf(icon, PATH_MAX, "%s:/icon/normal", ic->file->info.icon); + } + im2 = imlib_load_image(icon); + if (im2) + { + int iw, ih; + + imlib_context_set_image(im2); + iw = imlib_image_get_width(); + ih = imlib_image_get_height(); + imlib_context_set_image(im); + imlib_blend_image_onto_image(im2, 1, + 0, 0, iw, ih, + icx, icy, iw, ih); + imlib_context_set_image(im2); + imlib_free_image(); + imlib_context_set_image(im); + } + else + { + D("eek cant load\n"); + } + } + D_RETURN; +} + + + +static void +_start_drag(E_View *v, int _x, int _y) +{ + Pixmap pmap, mask; + Evas_List l; + int x, y, xx, yy, rw, rh, downx, downy, wx, wy, ww, wh; + int dx, dy; + + if (!v) D_RETURN; + + dx = abs(v->select.down.x - _x); + dy = abs(v->select.down.y - _y); + /* drag treshold */ + if ((dx < 3) && (dy < 3)) + D_RETURN; + + /* find extents of icons to be dragged */ + x = y = xx = yy = 999999999; + + D("sel count %i\n", v->select.count); + if (v->select.count > 0) + { + for (l = v->icons; l; l = l->next) + { + E_Icon *ic; + + ic = l->data; + if (ic->state.selected) + { + int ix, iy, iw, ih; + + ix = ic->view->scroll.x + ic->geom.x + v->location.x; + iy = ic->view->scroll.y + ic->geom.y + v->location.y; + iw = ic->geom.w; + ih = ic->geom.h; + if (ix < x) x = ix; + if (iy < y) y = iy; + if ((ix + iw) > xx) xx = ix + iw; + if ((iy + ih) > yy) yy = iy + ih; + } + } + } + ecore_window_get_geometry(0, NULL, NULL, &rw, &rh); + downx = v->select.down.x + v->location.x; + downy = v->select.down.y + v->location.y; + + wx = x; + ww = xx - x; + if (wx < - (rw - downx)) + { + wx = - (rw - downx); + ww -= (wx - x); + } + if ((wx + ww) > (rw + downx)) + ww = (rw + downx) - wx; + wy = y; + wh = yy - y; + if (wy < - (rh - downy)) + { + wy = - (rh - downy); + wh -= (wy - y); + } + if ((wy + wh) > (rh + downy)) + wh = (rh + downy) - wy; + + v->drag.x = wx + v->location.x; + v->drag.y = wy + v->location.y; + v->drag.offset.x = downx - v->drag.x; + v->drag.offset.y = downy - v->drag.y; + + if ((ww < 1) || (wh < 1)) D_RETURN; + + v->drag.win = ecore_window_override_new(0, wx, wy, ww, wh); + pmap = ecore_pixmap_new(v->drag.win, ww, wh, 0); + mask = ecore_pixmap_new(v->drag.win, ww, wh, 1); + { + Imlib_Image im; + + im = imlib_create_image(ww, wh); + imlib_context_set_image(im); + imlib_image_set_has_alpha(1); + imlib_context_set_blend(1); + imlib_image_clear(); + imlib_context_set_color_modifier(NULL); + imlib_context_set_cliprect(0, 0, 0, 0); + imlib_context_set_angle(0); + + _paint_selected_icons_onto_drag_window(v, im, wx, wy); + + imlib_context_set_image(im); + if (ww * wh < (200 * 200)) imlib_context_set_dither_mask(1); + else imlib_context_set_dither_mask(0); + imlib_context_set_dither(1); + imlib_context_set_drawable(pmap); + imlib_context_set_mask(mask); + imlib_context_set_blend(0); + imlib_context_set_color_modifier(NULL); + imlib_render_image_on_drawable(0, 0); + imlib_free_image(); + } + ecore_window_set_background_pixmap(v->drag.win, pmap); + ecore_window_set_shape_mask(v->drag.win, mask); + ecore_window_ignore(v->drag.win); + ecore_window_raise(v->drag.win); + ecore_window_show(v->drag.win); + ecore_pixmap_free(pmap); + ecore_pixmap_free(mask); + + /* Initiate dnd */ + ecore_dnd_set_mode_copy(); + ecore_dnd_set_data(v->win.base); + + ecore_dnd_own_selection(v->win.base); + + v->drag.started = 1; +} + +static void e_icon_move_cb(void *_data, Evas _e, Evas_Object _o, int _b, int _x, int _y) { E_Icon *ic; Ecore_Event *ev; Ecore_Event_Mouse_Move *e; D_ENTER; - - ev = e_view_get_current_event(); + ev = e_view_get_current_event(); if (!ev) - D_RETURN; + D_RETURN; + e = ev->event; ic = _data; if (!ic->state.clicked) - D_RETURN; + D_RETURN; if (!ic->view->drag.started) - { - int dx, dy; - - dx = ic->view->select.down.x - _x; - dy = ic->view->select.down.y - _y; - if (dx < 0) dx = -dx; - if (dy < 0) dy = -dy; - if ((dx > 3) || (dy > 3)) - { - Pixmap pmap, mask; - Evas_List l; - int x, y, xx, yy, rw, rh, downx, downy, wx, wy, ww, wh; - - /* find extents of icons to be dragged */ - x = 999999999; - y = 999999999; - xx = -999999999; - yy = -999999999; - for (l = VM->views; l; l = l->next) - { - E_View *v; - Evas_List ll; - - v = l->data; - D("sel count %i\n", v->select.count); - if (v->select.count > 0) - { - for (ll = v->icons; ll; ll = ll->next) - { - E_Icon *ic; - - ic = ll->data; - if (ic->state.selected) - { - int ix, iy, iw, ih; - - ix = ic->view->scroll.x + ic->geom.x + v->location.x; - iy = ic->view->scroll.y + ic->geom.y + v->location.y; - iw = ic->geom.w; - ih = ic->geom.h; - if (ix < x) x = ix; - if (iy < y) y = iy; - if ((ix + iw) > xx) xx = ix + iw; - if ((iy + ih) > yy) yy = iy + ih; - } - } - } - } - ecore_window_get_geometry(0, NULL, NULL, &rw, &rh); - downx = ic->view->select.down.x + ic->view->location.x; - downy = ic->view->select.down.y + ic->view->location.y; - - wx = x; - ww = xx - x; - if (wx < - (rw - downx)) - { - wx = - (rw - downx); - ww -= (wx - x); - } - if ((wx + ww) > (rw + downx)) - ww = (rw + downx) - wx; - wy = y; - wh = yy - y; - if (wy < - (rh - downy)) - { - wy = - (rh - downy); - wh -= (wy - y); - } - if ((wy + wh) > (rh + downy)) - wh = (rh + downy) - wy; - - - ic->view->drag.x = wx + ic->view->location.x; - ic->view->drag.y = wy + ic->view->location.y; - ic->view->drag.offset.x = downx - ic->view->drag.x; - ic->view->drag.offset.y = downy - ic->view->drag.y; - - if ((ww < 1) || (wh < 1)) D_RETURN; - ic->view->drag.win = ecore_window_override_new(0, wx, wy, ww, wh); - pmap = ecore_pixmap_new(ic->view->drag.win, ww, wh, 0); - mask = ecore_pixmap_new(ic->view->drag.win, ww, wh, 1); - { - Imlib_Image im; - - im = imlib_create_image(ww, wh); - imlib_context_set_image(im); - imlib_image_set_has_alpha(1); - imlib_context_set_blend(1); - imlib_image_clear(); - imlib_context_set_color_modifier(NULL); - imlib_context_set_cliprect(0, 0, 0, 0); - imlib_context_set_angle(0); - - for (l = VM->views; l; l = l->next) - { - E_View *v; - Evas_List ll; - - v = l->data; - if (v->select.count > 0) - { - for (ll = v->icons; ll; ll = ll->next) { - E_Icon *ic; - - ic = ll->data; - if (ic->state.selected) - { - double ix, iy; - int icx, icy; - Imlib_Image im2; - char icon[PATH_MAX]; - - evas_get_geometry(ic->view->evas, - ic->obj.icon, - &ix, &iy, NULL, NULL); - icx = ix + v->location.x - wx; - icy = iy + v->location.y - wy; - if (!ic->file->info.icon) - { - D("EEEEEEEEEEK %s has no icon\n", ic->file->file); - D_RETURN; - } - if (ic->state.clicked) - { - snprintf(icon, PATH_MAX, "%s:/icon/clicked", ic->file->info.icon); - } - else if (ic->state.selected) - { - snprintf(icon, PATH_MAX, "%s:/icon/selected", ic->file->info.icon); - } - else - { - snprintf(icon, PATH_MAX, "%s:/icon/normal", ic->file->info.icon); - } - im2 = imlib_load_image(icon); - if (im2) - { - int iw, ih; - - imlib_context_set_image(im2); - iw = imlib_image_get_width(); - ih = imlib_image_get_height(); - imlib_context_set_image(im); - imlib_blend_image_onto_image(im2, 1, - 0, 0, iw, ih, - icx, icy, iw, ih); - imlib_context_set_image(im2); - imlib_free_image(); - imlib_context_set_image(im); - } - else - { - D("eek cant load\n"); - } - } - } - } - } - imlib_context_set_image(im); - if (ww * wh < (200 * 200)) imlib_context_set_dither_mask(1); - else imlib_context_set_dither_mask(0); - imlib_context_set_dither(1); - imlib_context_set_drawable(pmap); - imlib_context_set_mask(mask); - imlib_context_set_blend(0); - imlib_context_set_color_modifier(NULL); - imlib_render_image_on_drawable(0, 0); - imlib_free_image(); - } - ecore_window_set_background_pixmap(ic->view->drag.win, pmap); - ecore_window_set_shape_mask(ic->view->drag.win, mask); - ecore_window_ignore(ic->view->drag.win); - ecore_window_raise(ic->view->drag.win); - ecore_window_show(ic->view->drag.win); - ecore_pixmap_free(pmap); - ecore_pixmap_free(mask); - - /* Initiate dnd */ - ecore_dnd_set_mode_copy(); - ecore_dnd_set_data(ic->view->win.base); - - ecore_dnd_own_selection(ic->view->win.base); - - ic->view->drag.started = 1; - } - } + { + _start_drag(ic->view, _x, _y); + } + else if (ic->view->drag.started) + { + int x, y; - if (ic->view->drag.started) - { - int x, y; - - x = _x - ic->view->drag.offset.x; - y = _y - ic->view->drag.offset.y; - ic->view->drag.x = x; - ic->view->drag.y = y; - ic->view->drag.update = 1; - ic->view->changed = 1; + x = _x - ic->view->drag.offset.x; + y = _y - ic->view->drag.offset.y; + ic->view->drag.x = x; + ic->view->drag.y = y; + ic->view->drag.update = 1; + ic->view->changed = 1; - if(e->mods & ECORE_EVENT_KEY_MODIFIER_SHIFT) - { - ecore_dnd_set_mode_copy(); - ic->view->drag.drop_mode = E_DND_COPY; - } - else - { - ecore_dnd_set_mode_move(); - ic->view->drag.drop_mode = E_DND_MOVE; - } - ecore_dnd_set_data(ic->view->win.base); + if(e->mods & ECORE_EVENT_KEY_MODIFIER_SHIFT) + { + ecore_dnd_set_mode_copy(); + ic->view->drag.drop_mode = E_DND_COPY; + } + else + { + ecore_dnd_set_mode_move(); + ic->view->drag.drop_mode = E_DND_MOVE; + } + ecore_dnd_set_data(ic->view->win.base); - /* Handle dnd motion - dragging==1 */ - ecore_pointer_xy_get(&x, &y); - ecore_window_dnd_handle_motion( ic->view->win.base, x, y, 1); - } + /* Handle dnd motion - dragging==1 */ + ecore_pointer_xy_get(&x, &y); + ecore_window_dnd_handle_motion( ic->view->win.base, x, y, 1); + } D_RETURN; UN(_e); UN(_o); @@ -829,21 +832,7 @@ void e_icon_select(E_Icon *ic) { - Evas_List l; D_ENTER; - if (ic->view->select.lock) - D_RETURN; - if (ic->view->select.count == 0) - { - /* lock all other views of our dir */ - for (l= ic->view->model->views;l;l=l->next) - { - E_View *v = (E_View *) l->data; - v->select.lock = 1; - } - /* unlock ourselves */ - ic->view->select.lock = 0; - } if (!ic->state.selected) { @@ -858,10 +847,7 @@ void e_icon_deselect(E_Icon *ic) { - Evas_List l; D_ENTER; - if (ic->view->select.lock) - D_RETURN; if (ic->state.selected) { @@ -869,16 +855,6 @@ ic->view->select.count--; e_icon_update_state(ic); } - if (ic->view->select.count == 0) - { - /* we have just unselected the last icon. Unlock all - * other views of our model. */ - for (l= ic->view->model->views;l;l=l->next) - { - E_View *v = (E_View *) l->data; - v->select.lock = 0; - } - } D_RETURN; } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/view.c,v retrieving revision 1.128 retrieving revision 1.129 diff -u -3 -r1.128 -r1.129 --- view.c 1 Mar 2002 00:52:44 -0000 1.128 +++ view.c 1 Mar 2002 16:31:28 -0000 1.129 @@ -320,7 +320,7 @@ if (!(ev->mods & (multi_select_mod | range_select_mod))) { v->select.last_count = v->select.count; - e_view_deselect_all(); + e_view_deselect_all(v); } if (_b == 1) @@ -533,53 +533,35 @@ void -e_view_deselect_all(void) +e_view_deselect_all(E_View *v) { - Evas_List ll; - + Evas_List l; + D_ENTER; - - for (ll = VM->views; ll; ll = ll->next) - { - Evas_List l; - E_View *v; - - v = ll->data; - for (l = v->icons; l; l = l->next) - { - E_Icon *ic; - - ic = l->data; - e_icon_deselect(ic); - } - } + for (l = v->icons; l; l = l->next) + { + E_Icon *ic; + ic = l->data; + e_icon_deselect(ic); + } D_RETURN; } void e_view_deselect_all_except(E_Icon *not_ic) { - Evas_List ll; - + Evas_List l; + D_ENTER; - - for (ll = VM->views; ll; ll = ll->next) - { - Evas_List l; - E_View *v; - - v = ll->data; - for (l = v->icons; l; l = l->next) - { - E_Icon *ic; - - ic = l->data; - if (ic != not_ic) - e_icon_deselect(ic); - } - } + for (l = not_ic->view->icons; l; l = l->next) + { + E_Icon *ic; + ic = l->data; + if (ic != not_ic) + e_icon_deselect(ic); + } D_RETURN; } @@ -1653,7 +1635,6 @@ v->options.back_pixmap = 0; #endif #endif - v->select.lock = 0; v->select.config.grad_size.l = 8; v->select.config.grad_size.r = 8; v->select.config.grad_size.t = 8; =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/view.h,v retrieving revision 1.36 retrieving revision 1.37 diff -u -3 -r1.36 -r1.37 --- view.h 27 Feb 2002 10:39:08 -0000 1.36 +++ view.h 1 Mar 2002 16:31:29 -0000 1.37 @@ -94,9 +94,6 @@ } spacing; struct { int on; - /* we set this in all other views of our view_model - * when the first icon in a view is selected. */ - int lock; /* The number of selected icons. */ int count; /* The number of icons we selected the last time. @@ -107,6 +104,7 @@ struct { int x, y; } down; + struct { struct { int r, g, b, a; @@ -131,6 +129,7 @@ Evas_Object grad_b; } obj; } select; + struct { int started; Window win; @@ -190,7 +189,7 @@ void e_view_init(void); void e_view_selection_update(E_View *v); -void e_view_deselect_all(void); +void e_view_deselect_all(E_View *v); void e_view_deselect_all_except(E_Icon *not_ic); Ecore_Event *e_view_get_current_event(void); int e_view_filter_file(E_View *v, char *file); |
From: <enl...@li...> - 2002-03-01 18:01:27
|
Enlightenment CVS committal Author : tillsan Project : e17 Module : apps/e Dir : e17/apps/e/src Modified Files: view.c Log Message: user uses scrollbar -> something happens - better :) =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/view.c,v retrieving revision 1.129 retrieving revision 1.130 diff -u -3 -r1.129 -r1.130 --- view.c 1 Mar 2002 16:31:28 -0000 1.129 +++ view.c 1 Mar 2002 18:01:22 -0000 1.130 @@ -632,6 +632,7 @@ ic = l->data; e_icon_apply_xy(ic); } + v->changed = 1; D_RETURN; } |
From: <enl...@li...> - 2002-03-01 20:50:48
|
Enlightenment CVS committal Author : tillsan Project : e17 Module : apps/e Dir : e17/apps/e/src Modified Files: actions.c e_view_machine.c e_view_machine.h icons.c view.c view.h Log Message: - add e_view_machine_get_view_by_[base|main]_window - use it in about a zillion places - now VM->views is only accessed from within e_view_machine.c =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/actions.c,v retrieving revision 1.46 retrieving revision 1.47 diff -u -3 -r1.46 -r1.47 --- actions.c 24 Jan 2002 08:12:11 -0000 1.46 +++ actions.c 1 Mar 2002 20:50:46 -0000 1.47 @@ -7,6 +7,7 @@ #include "icccm.h" #include "keys.h" #include "view.h" +#include "e_view_machine.h" #include "util.h" #include "guides.h" #include "bordermenu.h" @@ -1566,7 +1567,7 @@ { D_ENTER; - e_view_close_all(); + e_view_machine_close_all_views(); ecore_focus_mode_reset(); ecore_sync(); @@ -1591,7 +1592,7 @@ { D_ENTER; - e_view_close_all(); + e_view_machine_close_all_views(); ecore_focus_mode_reset(); ecore_sync(); =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/e_view_machine.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_view_machine.c 27 Feb 2002 22:46:14 -0000 1.4 +++ e_view_machine.c 1 Mar 2002 20:50:46 -0000 1.5 @@ -43,6 +43,18 @@ D_RETURN; } +void +e_view_machine_close_all_views(void) +{ + Evas_List l; + D_ENTER; + for (l=VM->views;l;l=l->next) + { + E_View *v = l->data; + e_view_machine_unregister_view(v); + } + D_RETURN; +} E_View_Model * e_view_machine_model_lookup(char *path) @@ -76,5 +88,30 @@ D_RETURN_(NULL); } +E_View * +e_view_machine_get_view_by_main_window(Window win) +{ + Evas_List l; + D_ENTER; + for (l = VM->views; l; l = l->next) + { + E_View *v = l->data; + if (v && win == v->win.main) + D_RETURN_(v); + } + D_RETURN_(NULL); +} - +E_View * +e_view_machine_get_view_by_base_window(Window win) +{ + Evas_List l; + D_ENTER; + for (l = VM->views; l; l = l->next) + { + E_View *v = l->data; + if (v && win == v->win.base) + D_RETURN_(v); + } + D_RETURN_(NULL); +} =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/e_view_machine.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_view_machine.h 27 Feb 2002 22:46:14 -0000 1.3 +++ e_view_machine.h 1 Mar 2002 20:50:46 -0000 1.4 @@ -12,5 +12,9 @@ void e_view_machine_init(void); void e_view_machine_register_view(E_View *v); void e_view_machine_unregister_view(E_View *v); +void e_view_machine_close_all_views(void); E_View_Model *e_view_machine_model_lookup(char *path); +E_View *e_view_machine_get_view_by_main_window(Window win); +E_View *e_view_machine_get_view_by_base_window(Window win); + #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/icons.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -3 -r1.36 -r1.37 --- icons.c 1 Mar 2002 16:31:28 -0000 1.36 +++ icons.c 1 Mar 2002 20:50:46 -0000 1.37 @@ -860,7 +860,7 @@ void e_icon_exec(E_Icon *ic) -{ +{ D_ENTER; if (!strcmp(ic->file->info.mime.base, "dir") && @@ -884,7 +884,7 @@ ecore_window_set_name_class(v->win.base, "FileView", "E"); ecore_window_set_min_size(v->win.base, 8, 8); } - e_icon_deselect(ic); + e_icon_deselect(ic); D_RETURN; } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/view.c,v retrieving revision 1.130 retrieving revision 1.131 diff -u -3 -r1.130 -r1.131 --- view.c 1 Mar 2002 18:01:22 -0000 1.130 +++ view.c 1 Mar 2002 20:50:46 -0000 1.131 @@ -864,67 +864,63 @@ e_configure(Ecore_Event * ev) { Ecore_Event_Window_Configure *e; - Evas_List l; + E_View *v; D_ENTER; e = ev->event; - for (l = VM->views; l; l = l->next) - { - E_View *v; - - v = l->data; - if (e->win == v->win.base) - { - /* win, root, x, y, w, h, wm_generated */ - D("Configure for view: %s\n", v->name); - if (e->wm_generated) - { - D("wm generated %i %i, %ix%i\n", e->x, e->y, e->w, e->h); - if ((e->x != v->location.x) || (e->y != v->location.y)) - { - D("new spot!\n"); - v->location.x = e->x; - v->location.y = e->y; - /* FIXME */ - //e_view_queue_geometry_record(v); - } - } - D("size %ix%i\n", e->w, e->h); - if ((e->w != v->size.w) || (e->h != v->size.h) || (v->size.force)) - { - v->size.force = 0; - D("... a new size!\n"); - v->size.w = e->w; - v->size.h = e->h; - if (v->pmap) ecore_pixmap_free(v->pmap); - v->pmap = 0; - ecore_window_resize(v->win.main, v->size.w, v->size.h); - if (v->options.back_pixmap) - { - v->pmap = ecore_pixmap_new(v->win.main, v->size.w, v->size.h, 0); - evas_set_output(v->evas, ecore_display_get(), v->pmap, - evas_get_visual(v->evas), - evas_get_colormap(v->evas)); - ecore_window_set_background_pixmap(v->win.main, v->pmap); - ecore_window_clear(v->win.main); - } - if (v->bg) e_bg_resize(v->bg, v->size.w, v->size.h); - D("evas_set_output_viewpor(%p)\n", v->evas); - evas_set_output_viewport(v->evas, 0, 0, v->size.w, v->size.h); - evas_set_output_size(v->evas, v->size.w, v->size.h); - e_view_scroll_to(v, v->scroll.x, v->scroll.y); - e_view_arrange(v); - /* FIXME */ - //e_view_queue_geometry_record(v); - e_scrollbar_move(v->scrollbar.v, v->size.w - v->scrollbar.v->w, 0); - e_scrollbar_resize(v->scrollbar.v, v->scrollbar.v->w, v->size.h - v->scrollbar.h->h); - e_scrollbar_move(v->scrollbar.h, 0, v->size.h - v->scrollbar.h->h); - e_scrollbar_resize(v->scrollbar.h, v->size.w - v->scrollbar.v->w, v->scrollbar.h->h); - } - } - } - + if (e && e->win) + { + if ( (v=e_view_machine_get_view_by_base_window(e->win)) ) + { + /* win, root, x, y, w, h, wm_generated */ + D("Configure for view: %s\n", v->name); + if (e->wm_generated) + { + D("wm generated %i %i, %ix%i\n", e->x, e->y, e->w, e->h); + if ((e->x != v->location.x) || (e->y != v->location.y)) + { + D("new spot!\n"); + v->location.x = e->x; + v->location.y = e->y; + /* FIXME */ + //e_view_queue_geometry_record(v); + } + } + D("size %ix%i\n", e->w, e->h); + if ((e->w != v->size.w) || (e->h != v->size.h) || (v->size.force)) + { + v->size.force = 0; + D("... a new size!\n"); + v->size.w = e->w; + v->size.h = e->h; + if (v->pmap) ecore_pixmap_free(v->pmap); + v->pmap = 0; + ecore_window_resize(v->win.main, v->size.w, v->size.h); + if (v->options.back_pixmap) + { + v->pmap = ecore_pixmap_new(v->win.main, v->size.w, v->size.h, 0); + evas_set_output(v->evas, ecore_display_get(), v->pmap, + evas_get_visual(v->evas), + evas_get_colormap(v->evas)); + ecore_window_set_background_pixmap(v->win.main, v->pmap); + ecore_window_clear(v->win.main); + } + if (v->bg) e_bg_resize(v->bg, v->size.w, v->size.h); + D("evas_set_output_viewpor(%p)\n", v->evas); + evas_set_output_viewport(v->evas, 0, 0, v->size.w, v->size.h); + evas_set_output_size(v->evas, v->size.w, v->size.h); + e_view_scroll_to(v, v->scroll.x, v->scroll.y); + e_view_arrange(v); + /* FIXME */ + //e_view_queue_geometry_record(v); + e_scrollbar_move(v->scrollbar.v, v->size.w - v->scrollbar.v->w, 0); + e_scrollbar_resize(v->scrollbar.v, v->scrollbar.v->w, v->size.h - v->scrollbar.h->h); + e_scrollbar_move(v->scrollbar.h, 0, v->size.h - v->scrollbar.h->h); + e_scrollbar_resize(v->scrollbar.h, v->size.w - v->scrollbar.v->w, v->scrollbar.h->h); + } + } + } D_RETURN; } @@ -932,21 +928,16 @@ e_property(Ecore_Event * ev) { Ecore_Event_Window_Configure *e; - Evas_List l; - + E_View *v; + D_ENTER; - e = ev->event; - for (l = VM->views; l; l = l->next) - { - E_View *v; - - v = l->data; - if (e->win == v->win.base) - { - } - } - + if (e && e->win) + { + if ( (v=e_view_machine_get_view_by_base_window(e->win)) ) + { + } + } D_RETURN; } @@ -954,21 +945,16 @@ e_unmap(Ecore_Event * ev) { Ecore_Event_Window_Unmap *e; - Evas_List l; - + E_View *v; + D_ENTER; - e = ev->event; - for (l = VM->views; l; l = l->next) - { - E_View *v; - - v = l->data; - if (e->win == v->win.base) - { - } - } - + if (e && e->win) + { + if ( (v=e_view_machine_get_view_by_base_window(e->win)) ) + { + } + } D_RETURN; } @@ -976,21 +962,16 @@ e_visibility(Ecore_Event * ev) { Ecore_Event_Window_Unmap *e; - Evas_List l; - + E_View *v; + D_ENTER; - e = ev->event; - for (l = VM->views; l; l = l->next) - { - E_View *v; - - v = l->data; - if (e->win == v->win.base) - { - } - } - + if (e && e->win) + { + if ( (v=e_view_machine_get_view_by_base_window(e->win)) ) + { + } + } D_RETURN; } @@ -998,21 +979,16 @@ e_focus_in(Ecore_Event * ev) { Ecore_Event_Window_Focus_In *e; - Evas_List l; - + E_View *v; + D_ENTER; - e = ev->event; - for (l = VM->views; l; l = l->next) - { - E_View *v; - - v = l->data; - if (e->win == v->win.base) - { - } - } - + if (e && e->win) + { + if ( (v=e_view_machine_get_view_by_base_window(e->win)) ) + { + } + } D_RETURN; } @@ -1020,21 +996,16 @@ e_focus_out(Ecore_Event * ev) { Ecore_Event_Window_Focus_Out *e; - Evas_List l; - + E_View *v; + D_ENTER; - e = ev->event; - for (l = VM->views; l; l = l->next) - { - E_View *v; - - v = l->data; - if (e->win == v->win.base) - { - } - } - + if (e && e->win) + { + if ( (v=e_view_machine_get_view_by_base_window(e->win)) ) + { + } + } D_RETURN; } @@ -1042,23 +1013,17 @@ e_delete(Ecore_Event * ev) { Ecore_Event_Window_Delete *e; - Evas_List l; - + E_View *v; + D_ENTER; - e = ev->event; - for (l = VM->views; l; l = l->next) - { - E_View *v; - - v = l->data; - if (e->win == v->win.base) - { - e_object_unref(E_OBJECT(v)); - D_RETURN; - } - } - + if (e && e->win) + { + if ( (v=e_view_machine_get_view_by_base_window(e->win)) ) + { + e_object_unref(E_OBJECT(v)); + } + } D_RETURN; } @@ -1072,48 +1037,40 @@ { Ecore_Event_Dnd_Drop_Status *e; /* - * typedef struct _ecore_event_dnd_drop_status - * { - * Window win, root, source_win; - * int x, y, w, h; - * int copy, link, move, private; - * int all_position_msgs; - * int ok; - * } Ecore_Event_Dnd_Drop_Status; - */ - Evas_List l; - + * typedef struct _ecore_event_dnd_drop_status + * { + * Window win, root, source_win; + * int x, y, w, h; + * int copy, link, move, private; + * int all_position_msgs; + * int ok; + * } Ecore_Event_Dnd_Drop_Status; + */ + E_View *v; + D_ENTER; - e = ev->event; - for (l = VM->views; l; l = l->next) - { - E_View *v; - - v = l->data; - if (e->win == v->win.base) - { - - if( dnd_pending_mode != E_DND_DELETED && - dnd_pending_mode != E_DND_COPIED ) - { - if( e->copy ) - dnd_pending_mode = E_DND_COPY; - else if( e->move ) - dnd_pending_mode = E_DND_MOVE; - else if( e->link ) - dnd_pending_mode = E_DND_LINK; - else - dnd_pending_mode = E_DND_ASK; - } - - ecore_window_dnd_ok(e->ok); - - v->changed = 1; - v->drag.icon_hide = 1; - } - } - + if (e && e->win) + { + if ( (v=e_view_machine_get_view_by_base_window(e->win)) ) + { + if( dnd_pending_mode != E_DND_DELETED && + dnd_pending_mode != E_DND_COPIED ) + { + if( e->copy ) + dnd_pending_mode = E_DND_COPY; + else if( e->move ) + dnd_pending_mode = E_DND_MOVE; + else if( e->link ) + dnd_pending_mode = E_DND_LINK; + else + dnd_pending_mode = E_DND_ASK; + } + ecore_window_dnd_ok(e->ok); + v->changed = 1; + v->drag.icon_hide = 1; + } + } D_RETURN; } @@ -1122,21 +1079,16 @@ e_wheel(Ecore_Event * ev) { Ecore_Event_Wheel *e; - Evas_List l; - + E_View *v; + D_ENTER; - e = ev->event; - for (l = VM->views; l; l = l->next) - { - E_View *v; - - v = l->data; - if (e->win == v->win.main) - { - } - } - + if (e && e->win) + { + if ( (v=e_view_machine_get_view_by_main_window(e->win)) ) + { + } + } D_RETURN; } @@ -1144,51 +1096,45 @@ e_key_down(Ecore_Event * ev) { Ecore_Event_Key_Down *e; - Evas_List l; - + E_View *v; + D_ENTER; - e = ev->event; - for (l = VM->views; l; l = l->next) - { - E_View *v; - - v = l->data; - if ((e->win == v->win.base) || - (e->win == v->win.main)) - { - if (!strcmp(e->key, "Up")) - { - e_scrollbar_set_value(v->scrollbar.v, v->scrollbar.v->val - 8); - } - else if (!strcmp(e->key, "Down")) - { - e_scrollbar_set_value(v->scrollbar.v, v->scrollbar.v->val + 8); - } - else if (!strcmp(e->key, "Left")) - { - e_scrollbar_set_value(v->scrollbar.h, v->scrollbar.h->val - 8); - } - else if (!strcmp(e->key, "Right")) - { - e_scrollbar_set_value(v->scrollbar.h, v->scrollbar.h->val + 8); - } - else if (!strcmp(e->key, "Escape")) - { - } - else - { - char *type; - - type = ecore_keypress_translate_into_typeable(e); - if (type) - { - } - } - D_RETURN; - } - } + if (e && e->win) + { + if ( (v=e_view_machine_get_view_by_main_window(e->win)) + ||(v=e_view_machine_get_view_by_base_window(e->win)) ) + { + if (!strcmp(e->key, "Up")) + { + e_scrollbar_set_value(v->scrollbar.v, v->scrollbar.v->val - 8); + } + else if (!strcmp(e->key, "Down")) + { + e_scrollbar_set_value(v->scrollbar.v, v->scrollbar.v->val + 8); + } + else if (!strcmp(e->key, "Left")) + { + e_scrollbar_set_value(v->scrollbar.h, v->scrollbar.h->val - 8); + } + else if (!strcmp(e->key, "Right")) + { + e_scrollbar_set_value(v->scrollbar.h, v->scrollbar.h->val + 8); + } + else if (!strcmp(e->key, "Escape")) + { + } + else + { + char *type; + type = ecore_keypress_translate_into_typeable(e); + if (type) + { + } + } + } + } D_RETURN; } @@ -1196,19 +1142,16 @@ e_key_up(Ecore_Event * ev) { Ecore_Event_Key_Up *e; - Evas_List l; + E_View *v; D_ENTER; - e = ev->event; - D_RETURN; - for (l = VM->views; l; l = l->next) - { - E_View *v; - - v = l->data; - } - + if (e && e->win) + { + if ( (v=e_view_machine_get_view_by_main_window(e->win)) ) + { + } + } D_RETURN; } @@ -1216,32 +1159,27 @@ e_mouse_down(Ecore_Event * ev) { Ecore_Event_Mouse_Down *e; - Evas_List l; - + E_View *v; + D_ENTER; - e = ev->event; current_ev = ev; - for (l = VM->views; l; l = l->next) - { - E_View *v; - - v = l->data; - if (e->win == v->win.main) - { - int focus_mode; - E_CFG_INT(cfg_focus_mode, "settings", "/focus/mode", 0); - - E_CONFIG_INT_GET(cfg_focus_mode, focus_mode); - if (focus_mode == 2) - ecore_focus_to_window(v->win.base); - evas_event_button_down(v->evas, e->x, e->y, e->button); - current_ev = NULL; - D_RETURN; - } - } - current_ev = NULL; + if (e && e->win) + { + if ( (v=e_view_machine_get_view_by_main_window(e->win)) ) + { + int focus_mode; + E_CFG_INT(cfg_focus_mode, "settings", "/focus/mode", 0); + E_CONFIG_INT_GET(cfg_focus_mode, focus_mode); + if (focus_mode == 2) + ecore_focus_to_window(v->win.base); + evas_event_button_down(v->evas, e->x, e->y, e->button); + current_ev = NULL; + D_RETURN; + } + } + current_ev = NULL; D_RETURN; } @@ -1249,26 +1187,19 @@ e_mouse_up(Ecore_Event * ev) { Ecore_Event_Mouse_Up *e; - Evas_List l; - + E_View *v; + D_ENTER; - e = ev->event; current_ev = ev; - for (l = VM->views; l; l = l->next) - { - E_View *v; - - v = l->data; - if (e->win == v->win.main) - { - evas_event_button_up(v->evas, e->x, e->y, e->button); - current_ev = NULL; - D_RETURN; - } - } + if (e && e->win) + { + if ( (v=e_view_machine_get_view_by_main_window(e->win)) ) + { + evas_event_button_up(v->evas, e->x, e->y, e->button); + } + } current_ev = NULL; - D_RETURN; } @@ -1276,26 +1207,19 @@ e_mouse_move(Ecore_Event * ev) { Ecore_Event_Mouse_Move *e; - Evas_List l; - + E_View *v; + D_ENTER; - e = ev->event; current_ev = ev; - for (l = VM->views; l; l = l->next) - { - E_View *v; - - v = l->data; - if (e->win == v->win.main) - { - evas_event_move(v->evas, e->x, e->y); - current_ev = NULL; - D_RETURN; - } - } + if (e && e->win) + { + if ( (v=e_view_machine_get_view_by_main_window(e->win)) ) + { + evas_event_move(v->evas, e->x, e->y); + } + } current_ev = NULL; - D_RETURN; } @@ -1303,27 +1227,21 @@ e_mouse_in(Ecore_Event * ev) { Ecore_Event_Window_Enter *e; - Evas_List l; + E_View *v; D_ENTER; - e = ev->event; current_ev = ev; - for (l = VM->views; l; l = l->next) - { - E_View *v; - - v = l->data; - if (e->win == v->win.main) - { - if (v->model->is_desktop) - { - evas_event_enter(v->evas); - } - current_ev = NULL; - D_RETURN; - } - } + if (e && e->win) + { + if( (v = e_view_machine_get_view_by_main_window(e->win)) ) + { + if (v->model->is_desktop) + { + evas_event_enter(v->evas); + } + } + } current_ev = NULL; D_RETURN; @@ -1333,24 +1251,18 @@ e_mouse_out(Ecore_Event * ev) { Ecore_Event_Window_Leave *e; - Evas_List l; + E_View *v; D_ENTER; - e = ev->event; current_ev = ev; - for (l = VM->views; l; l = l->next) - { - E_View *v; - - v = l->data; - if (e->win == v->win.main) - { - evas_event_leave(v->evas); - current_ev = NULL; - D_RETURN; - } - } + if (e && e->win) + { + if( (v = e_view_machine_get_view_by_main_window(e->win)) ) + { + evas_event_leave(v->evas); + } + } current_ev = NULL; D_RETURN; @@ -1360,25 +1272,20 @@ e_window_expose(Ecore_Event * ev) { Ecore_Event_Window_Expose *e; - Evas_List l; - + E_View *v; + D_ENTER; - e = ev->event; - for (l = VM->views; l; l = l->next) - { - E_View *v; - - v = l->data; - if (e->win == v->win.main) - { - if (!(v->pmap)) - evas_update_rect(v->evas, e->x, e->y, e->w, e->h); - v->changed = 1; - D_RETURN; - } - } - + current_ev = ev; + if (e && e->win) + { + if( (v = e_view_machine_get_view_by_main_window(e->win)) ) + { + if (!(v->pmap)) + evas_update_rect(v->evas, e->x, e->y, e->w, e->h); + v->changed = 1; + } + } D_RETURN; } @@ -1541,41 +1448,6 @@ D_RETURN; } -E_View * -e_view_find_by_window(Window win) -{ - Evas_List l; - - D_ENTER; - - for (l = VM->views; l; l = l->next) - { - E_View *v; - - v = l->data; - if (v->win.base == win) - D_RETURN_(v); - } - - D_RETURN_(NULL); -} - -void -e_view_close_all(void) -{ - D_ENTER; - - while (VM->views) - { - E_View *v; - - v = VM->views->data; - e_object_unref(E_OBJECT(v)); - } - - D_RETURN; -} - static void e_view_cleanup(E_View *v) { @@ -2113,7 +1985,6 @@ * Atom destination_atom; * } Ecore_Event_Dnd_Data_Request; */ - Evas_List l; E_View *v; Evas_List ll; char *data = NULL; @@ -2142,12 +2013,8 @@ * } */ e = ev->event; - for (l = VM->views; l; l = l->next) - { - v = l->data; - if (e->win == v->win.base) - break; - } + if ( !(v =e_view_machine_get_view_by_base_window(e->win)) ) + D_RETURN; if (e->uri_list) { @@ -2243,9 +2110,7 @@ D_RETURN; } - - - static void +static void e_dnd_drop_end(Ecore_Event * ev) { Ecore_Event_Dnd_Drop_End *e; @@ -2255,17 +2120,14 @@ * Window win, root, source_win; * } Ecore_Event_Dnd_Drop_End; */ - Evas_List l; + E_View *v; D_ENTER; e = ev->event; - for (l = VM->views; l; l = l->next) + if (e && e->win) { - E_View *v; - - v = l->data; - if (e->win == v->win.base) + if ( (v=e_view_machine_get_view_by_base_window(e->win)) ) { if(v_dnd_source) { @@ -2282,12 +2144,9 @@ v_dnd_source->changed = 1; v_dnd_source->drag.icon_show = 1; } - e_dnd_drop_request_free(); - D_RETURN; } } - D_RETURN; } @@ -2295,54 +2154,48 @@ static void e_dnd_drop_position(Ecore_Event * ev) { - Ecore_Event_Dnd_Drop_Position *e; - /* + Ecore_Event_Dnd_Drop_Position *e; + /* * typedef struct _ecore_event_dnd_drop_position * { * Window win, root, source_win; * int x, y; * } Ecore_Event_Dnd_Drop_Position; */ - Evas_List l; - + E_View *v; + D_ENTER; - e = ev->event; - for (l = VM->views; l; l = l->next) - { - E_View *v; - - v = l->data; - if (e->win == v->win.base) - { - if (v->iconbar) - { - if (e->x >= v->iconbar->icon_area.x && - e->x <= v->iconbar->icon_area.x + v->iconbar->icon_area.w && - e->y >= v->iconbar->icon_area.y && - e->y <= v->iconbar->icon_area.y + v->iconbar->icon_area.h) - { - v->iconbar->dnd.x = e->x; - v->iconbar->dnd.y = e->y; - /* for iconbar drops, allow from same view */ - v->drag.matching_drop_attempt = 0; - dnd_pending_mode = E_DND_ICONBAR_ADD; - } - } - - /* send XdndStatus (even to same view, we'll */ - /* ignore actions within the same view later */ - /* during the drop action.) */ - ecore_window_dnd_send_status_ok(v->win.base, e->source_win, - v->location.x, v->location.y, - v->size.w, v->size.h - ); + if (e && e->win) + { + if ( (v=e_view_machine_get_view_by_base_window(e->win)) ) + { + if (v->iconbar) + { + if (e->x >= v->iconbar->icon_area.x && + e->x <= v->iconbar->icon_area.x + v->iconbar->icon_area.w && + e->y >= v->iconbar->icon_area.y && + e->y <= v->iconbar->icon_area.y + v->iconbar->icon_area.h) + { + v->iconbar->dnd.x = e->x; + v->iconbar->dnd.y = e->y; + /* for iconbar drops, allow from same view */ + v->drag.matching_drop_attempt = 0; + dnd_pending_mode = E_DND_ICONBAR_ADD; + } + } - /* todo - cache window extents, don't send again within these extents. */ - D_RETURN; - } - } + /* send XdndStatus (even to same view, we'll */ + /* ignore actions within the same view later */ + /* during the drop action.) */ + ecore_window_dnd_send_status_ok(v->win.base, e->source_win, + v->location.x, v->location.y, + v->size.w, v->size.h + ); + /* todo - cache window extents, don't send again within these extents. */ + } + } D_RETURN; } @@ -2356,32 +2209,25 @@ * Window win, root, source_win; * } Ecore_Event_Dnd_Drop; */ - Evas_List l; - + E_View *v; + D_ENTER; - e = ev->event; - for (l = VM->views; l; l = l->next) - { - E_View *v; - - v = l->data; - if (e->win == v->win.base) - { - /* Dropped! Handle data */ - /* Same view or same underlying dir? Mark to skip action */ - if( e->win == e->source_win || v->model == v_dnd_source->model) - v->drag.matching_drop_attempt = 1; - /* Perform the action... */ - e_dnd_handle_drop (v); - - ecore_window_dnd_send_finished(v->win.base, e->source_win); - e_dnd_drop_request_free(); - - D_RETURN; - } - } + if (e && e->win) + { + if ( (v=e_view_machine_get_view_by_base_window(e->win)) ) + { + /* Dropped! Handle data */ + /* Same view or same underlying dir? Mark to skip action */ + if( e->win == e->source_win || v->model == v_dnd_source->model) + v->drag.matching_drop_attempt = 1; + /* Perform the action... */ + e_dnd_handle_drop (v); + ecore_window_dnd_send_finished(v->win.base, e->source_win); + e_dnd_drop_request_free(); + } + } D_RETURN; } @@ -2398,53 +2244,46 @@ * int copy, link, move; * } Ecore_Event_Dnd_Drop_Request; */ - Evas_List l; + E_View *v; D_ENTER; - e = ev->event; - for (l = VM->views; l; l = l->next) - { - E_View *v; - - v = l->data; - if (e->win == v->win.base) + if (e && e->win) + { + if ( (v = e_view_machine_get_view_by_base_window(e->win)) ) + { + /* if it exists, we already have the data... */ + if ((!dnd_files ) && (e->num_files > 0)) { - /* if it exists, we already have the data... */ - if ((!dnd_files ) && (e->num_files > 0)) - { - int i; + int i; - dnd_files = NEW_PTR(e->num_files); + dnd_files = NEW_PTR(e->num_files); - /* copy the file list locally, for use in a dnd_drop */ - for( i=0; i < e->num_files; i++ ) - dnd_files[i] = strdup( e->files[i] ); - - dnd_num_files = e->num_files; - - /* if the dnd source is e itself then dont use the event mode */ - if (e_view_find_by_window(e->source_win)) - { - v = e_view_find_by_window(e->source_win); - dnd_pending_mode = v->drag.drop_mode; - } - else - { - if( e->copy ) - dnd_pending_mode = E_DND_COPY; - else if( e->move ) - dnd_pending_mode = E_DND_MOVE; - else if( e->link ) - dnd_pending_mode = E_DND_LINK; - else - dnd_pending_mode = E_DND_ASK; - } - } - D_RETURN; + /* copy the file list locally, for use in a dnd_drop */ + for( i=0; i < e->num_files; i++ ) + dnd_files[i] = strdup( e->files[i] ); + + dnd_num_files = e->num_files; + + /* if the dnd source is e itself then dont use the event mode */ + if ( (v == e_view_machine_get_view_by_base_window(e->source_win))) + { + dnd_pending_mode = v->drag.drop_mode; + } + else + { + if( e->copy ) + dnd_pending_mode = E_DND_COPY; + else if( e->move ) + dnd_pending_mode = E_DND_MOVE; + else if( e->link ) + dnd_pending_mode = E_DND_LINK; + else + dnd_pending_mode = E_DND_ASK; + } } - } - + } + } D_RETURN; } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/view.h,v retrieving revision 1.37 retrieving revision 1.38 diff -u -3 -r1.37 -r1.38 --- view.h 1 Mar 2002 16:31:29 -0000 1.37 +++ view.h 1 Mar 2002 20:50:46 -0000 1.38 @@ -207,7 +207,6 @@ void e_view_queue_geometry_record(E_View *v); void e_view_queue_icon_xy_record(E_View *v); void e_view_queue_resort(E_View *v); -E_View *e_view_find_by_window(Window win); /** * e_view_new - Creates a new view object |
From: <enl...@li...> - 2002-03-01 21:55:57
|
Enlightenment CVS committal Author : tillsan Project : e17 Module : apps/e Dir : e17/apps/e/src Modified Files: e_view_machine.c Log Message: dont remove things from a list you are iterating over, thank you =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/e_view_machine.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_view_machine.c 1 Mar 2002 20:50:46 -0000 1.5 +++ e_view_machine.c 1 Mar 2002 21:55:55 -0000 1.6 @@ -46,9 +46,14 @@ void e_view_machine_close_all_views(void) { - Evas_List l; + Evas_List l,ll; D_ENTER; + /* Copy the list of views and unregister them */ for (l=VM->views;l;l=l->next) + { + ll = evas_list_append(ll, l->data); + } + for (l=ll;l;l=l->next) { E_View *v = l->data; e_view_machine_unregister_view(v); |
From: <enl...@li...> - 2002-03-02 10:20:10
|
Enlightenment CVS committal Author : tillsan Project : e17 Module : apps/e Dir : e17/apps/e/src Modified Files: e_view_machine.c e_view_machine.h e_view_model.c e_view_model.h view.c Log Message: shuffle around registering/unregistering of views and view models as per cK's suggestion remove unneeded function remove comments for obvious one liners =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/e_view_machine.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_view_machine.c 1 Mar 2002 21:55:55 -0000 1.6 +++ e_view_machine.c 2 Mar 2002 10:20:07 -0000 1.7 @@ -23,10 +23,25 @@ } void +e_view_machine_register_view_model (E_View_Model *m) +{ + D_ENTER; + VM->models = evas_list_append(VM->models, m); + D_RETURN; +} + +void +e_view_machine_unregister_view_model(E_View_Model *m) +{ + D_ENTER; + VM->models = evas_list_remove(VM->models, m); + D_RETURN; +} + +void e_view_machine_register_view(E_View *v) { D_ENTER; - /* Add view to the list of views */ VM->views = evas_list_append(VM->views, v); D_RETURN; } @@ -35,28 +50,20 @@ e_view_machine_unregister_view(E_View *v) { D_ENTER; - /* Remove the view from the global list of views - * and from the list of its model. */ VM->views = evas_list_remove(VM->views, v); - v->model->views = evas_list_remove(v->model->views, v); - e_object_unref (E_OBJECT(v->model)); D_RETURN; } void e_view_machine_close_all_views(void) { - Evas_List l,ll; + Evas_List l; D_ENTER; /* Copy the list of views and unregister them */ for (l=VM->views;l;l=l->next) { - ll = evas_list_append(ll, l->data); - } - for (l=ll;l;l=l->next) - { E_View *v = l->data; - e_view_machine_unregister_view(v); + e_object_unref (E_OBJECT(v->model)); } D_RETURN; } @@ -83,8 +90,6 @@ D("Model for this dir already exists\n"); IF_FREE(realpath); - - e_object_ref (E_OBJECT(m)); D_RETURN_(m); } } @@ -120,3 +125,4 @@ } D_RETURN_(NULL); } + =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/e_view_machine.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_view_machine.h 1 Mar 2002 20:50:46 -0000 1.4 +++ e_view_machine.h 2 Mar 2002 10:20:07 -0000 1.5 @@ -12,6 +12,9 @@ void e_view_machine_init(void); void e_view_machine_register_view(E_View *v); void e_view_machine_unregister_view(E_View *v); +void e_view_machine_register_view_model(E_View_Model *m); +void e_view_machine_unregister_view_model(E_View_Model *m); + void e_view_machine_close_all_views(void); E_View_Model *e_view_machine_model_lookup(char *path); E_View *e_view_machine_get_view_by_main_window(Window win); =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/e_view_model.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_view_model.c 27 Feb 2002 21:06:42 -0000 1.3 +++ e_view_model.c 2 Mar 2002 10:20:07 -0000 1.4 @@ -19,7 +19,6 @@ static void e_view_model_cleanup(E_View_Model *m); static void e_view_model_bg_reload_timeout(int val, void *data); static void e_view_model_set_default_background(E_View_Model *m); -static void e_view_model_redraw_views(E_View_Model *m); void e_view_model_init(void) @@ -42,7 +41,7 @@ e_fs_del_restart_handler(m->restarter); m->restarter = NULL; - VM->models = evas_list_remove(VM->models, m); + e_view_machine_unregister_view_model(m); e_object_cleanup(E_OBJECT(m)); @@ -64,28 +63,27 @@ e_object_init(E_OBJECT(m), (E_Cleanup_Func) e_view_model_cleanup); + e_view_machine_register_view_model(m); D_RETURN_(m); } -static void -e_view_model_redraw_views(E_View_Model *m) +void +e_view_model_register_view(E_View_Model *m, E_View *v) { - Evas_List l; - E_View *v; D_ENTER; + v->model = m; + m->views = evas_list_append(m->views, v); + e_object_ref (E_OBJECT(v->model)); + D_RETURN; +} - if (!m) - D_RETURN; - - /* set the dirty flag of all views. the next time the idle - * handler calls update_views, they'll be redrawn */ - for (l = m->views; l; l=l->next) - { - v = l->data; - v->changed = 1; - } - - D_RETURN; +void +e_view_model_unregister_view(E_View *v) +{ + D_ENTER; + v->model->views = evas_list_remove(v->model->views, v); + e_object_unref (E_OBJECT(v->model)); + D_RETURN; } static void =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/e_view_model.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_view_model.h 27 Feb 2002 21:06:42 -0000 1.3 +++ e_view_model.h 2 Mar 2002 10:20:07 -0000 1.4 @@ -54,6 +54,8 @@ E_View_Model * e_view_model_new(void); void e_view_model_init(void); +void e_view_model_register_view(E_View_Model *m,E_View *v); +void e_view_model_unregister_view(E_View *v); E_View_Model * e_view_model_find_by_monitor_id(int id); =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/view.c,v retrieving revision 1.132 retrieving revision 1.133 diff -u -3 -r1.132 -r1.133 --- view.c 2 Mar 2002 08:57:46 -0000 1.132 +++ view.c 2 Mar 2002 10:20:07 -0000 1.133 @@ -1457,8 +1457,6 @@ * not via a timeout, because we will destroy the object after this.*/ e_view_geometry_record(v); - e_view_machine_unregister_view(v); - if (v->iconbar) { e_iconbar_save_out_final(v->iconbar); @@ -1472,6 +1470,9 @@ snprintf(name, PATH_MAX, "resort_timer.%s", v->name); ecore_del_event_timer(name); + /* unregister with the underlying model and the global list of views */ + e_view_model_unregister_view(v); + e_view_machine_unregister_view(v); /* FIXME: clean up the rest!!! this leaks ... */ /* Call the destructor of the base class */ @@ -1551,9 +1552,7 @@ if (!(m = e_view_machine_model_lookup(path))) { D("Model for this dir doesn't exist, make a new one\n"); - m = e_view_model_new(); - VM->models = evas_list_append(VM->models, m); e_view_model_set_dir(m, path); snprintf(buf, PATH_MAX, "%s/.e_background.bg.db", m->dir); @@ -1574,8 +1573,7 @@ if (m) { - v->model = m; - v->model->views = evas_list_append(v->model->views, v); + e_view_model_register_view(m, v); /* FIXME do a real naming scheme here */ snprintf(buf, PATH_MAX, "%s:%d", v->model->dir, e_object_get_usecount(E_OBJECT(v->model))); e_strdup(v->name, buf); |
From: <enl...@li...> - 2002-03-02 16:40:58
|
Enlightenment CVS committal Author : tillsan Project : e17 Module : apps/e Dir : e17/apps/e/src Modified Files: e_view_model.c view.c Log Message: dont refcount the model twice for the first view =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/e_view_model.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_view_model.c 2 Mar 2002 10:20:07 -0000 1.4 +++ e_view_model.c 2 Mar 2002 16:40:56 -0000 1.5 @@ -72,8 +72,10 @@ { D_ENTER; v->model = m; - m->views = evas_list_append(m->views, v); - e_object_ref (E_OBJECT(v->model)); + m->views = evas_list_append(m->views, v); + /* dont ref the first time */ + if (m->views->next) + e_object_ref (E_OBJECT(v->model)); D_RETURN; } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/view.c,v retrieving revision 1.133 retrieving revision 1.134 diff -u -3 -r1.133 -r1.134 --- view.c 2 Mar 2002 10:20:07 -0000 1.133 +++ view.c 2 Mar 2002 16:40:57 -0000 1.134 @@ -1678,7 +1678,7 @@ e_scrollbar_resize(v->scrollbar.v, v->scrollbar.v->w, v->size.h - v->scrollbar.h->h); e_scrollbar_move(v->scrollbar.h, 0, v->size.h - v->scrollbar.h->h); e_scrollbar_resize(v->scrollbar.h, v->size.w - v->scrollbar.v->w, v->scrollbar.h->h); - + /* I support dnd */ ecore_window_dnd_advertise(v->win.base); @@ -1690,7 +1690,7 @@ e_iconbar_realize(v->iconbar); e_iconbar_set_view_window_spacing(v->iconbar); } - + e_view_bg_reload(v); /* e_epplet_load_from_layout(v);*/ v->changed = 1; @@ -1763,7 +1763,6 @@ if (v->options.back_pixmap) { Imlib_Updates up; - up = evas_render_updates(v->evas); /* special code to handle if we are double buffering to a pixmap */ /* and clear sections of the window if they got updated */ |
From: <enl...@li...> - 2002-03-03 10:40:15
|
Enlightenment CVS committal Author : tillsan Project : e17 Module : apps/e Dir : e17/apps/e/src Modified Files: actions.c actions.h background.c background.h block.c block.h border.c border.h bordermenu.c bordermenu.h config.c config.h cursors.c cursors.h debug.c debug.h delayed.c delayed.h desktops.c desktops.h e.h e_ferite.c e_ferite.h e_file.c e_file.h e_view_machine.c e_view_machine.h e_view_model.c e_view_model.h embed.c embed.h entry.c entry.h epplet.c epplet.h exec.c exec.h file.c file.h focus.c focus.h fs.c fs.h globals.c guides.c guides.h icccm.c icccm.h iconbar.c iconbar.h icons.c icons.h ipc.h keys.c keys.h main.c match.c match.h menu.c menu.h menubuild.c menubuild.h object.c object.h observer.c observer.h place.c place.h resist.c resist.h scrollbar.c scrollbar.h text.c text.h util.c util.h view.c view.h Added Files: .indent.pro Log Message: fix annoying redraw bug (finally) and hide it under an indent run ;) =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/actions.c,v retrieving revision 1.47 retrieving revision 1.48 diff -u -3 -r1.47 -r1.48 --- actions.c 1 Mar 2002 20:50:46 -0000 1.47 +++ actions.c 3 Mar 2002 10:40:05 -0000 1.48 @@ -13,125 +13,140 @@ #include "bordermenu.h" #include "block.h" -static Evas_List action_impls = NULL; -static Evas_List current_actions = NULL; -static Evas_List current_timers = NULL; +static Evas_List action_impls = NULL; +static Evas_List current_actions = NULL; +static Evas_List current_timers = NULL; + +static void e_action_find(char *action, E_Action_Type act, int button, + char *key, Ecore_Event_Key_Modifiers mods, + E_Object * object); +static void e_action_cleanup(E_Action * a); -static void e_action_find(char *action, E_Action_Type act, int button, char *key, - Ecore_Event_Key_Modifiers mods, E_Object *object); -static void e_action_cleanup(E_Action *a); +static void e_act_move_start(E_Object * object, E_Action * a, + void *data, int x, int y, int rx, int ry); -static void e_act_move_start (E_Object *object, E_Action *a, void *data, - int x, int y, int rx, int ry); +static void e_act_move_stop(E_Object * object, E_Action * a, void *data, + int x, int y, int rx, int ry); -static void e_act_move_stop (E_Object *object, E_Action *a, void *data, - int x, int y, int rx, int ry); +static void e_act_move_cont(E_Object * object, E_Action * a, void *data, + int x, int y, int rx, int ry, int dx, + int dy); -static void e_act_move_cont (E_Object *object, E_Action *a, void *data, - int x, int y, int rx, int ry, int dx, int dy); +static void e_act_resize_start(E_Object * object, E_Action * a, + void *data, int x, int y, int rx, + int ry); -static void e_act_resize_start (E_Object *object, E_Action *a, void *data, - int x, int y, int rx, int ry); +static void e_act_resize_stop(E_Object * object, E_Action * a, + void *data, int x, int y, int rx, int ry); -static void e_act_resize_stop (E_Object *object, E_Action *a, void *data, - int x, int y, int rx, int ry); +static void e_act_resize_cont(E_Object * object, E_Action * a, + void *data, int x, int y, int rx, int ry, + int dx, int dy); -static void e_act_resize_cont (E_Object *object, E_Action *a, void *data, - int x, int y, int rx, int ry, int dx, int dy); +static void e_act_resize_h_start(E_Object * object, E_Action * a, + void *data, int x, int y, int rx, + int ry); -static void e_act_resize_h_start (E_Object *object, E_Action *a, void *data, - int x, int y, int rx, int ry); +static void e_act_resize_h_stop(E_Object * object, E_Action * a, + void *data, int x, int y, int rx, + int ry); -static void e_act_resize_h_stop (E_Object *object, E_Action *a, void *data, - int x, int y, int rx, int ry); +static void e_act_resize_h_cont(E_Object * object, E_Action * a, + void *data, int x, int y, int rx, + int ry, int dx, int dy); -static void e_act_resize_h_cont (E_Object *object, E_Action *a, void *data, - int x, int y, int rx, int ry, int dx, int dy); +static void e_act_resize_v_start(E_Object * object, E_Action * a, + void *data, int x, int y, int rx, + int ry); -static void e_act_resize_v_start (E_Object *object, E_Action *a, void *data, - int x, int y, int rx, int ry); +static void e_act_resize_v_stop(E_Object * object, E_Action * a, + void *data, int x, int y, int rx, + int ry); -static void e_act_resize_v_stop (E_Object *object, E_Action *a, void *data, - int x, int y, int rx, int ry); +static void e_act_resize_v_cont(E_Object * object, E_Action * a, + void *data, int x, int y, int rx, + int ry, int dx, int dy); -static void e_act_resize_v_cont (E_Object *object, E_Action *a, void *data, - int x, int y, int rx, int ry, int dx, int dy); +static void e_act_close_start(E_Object * object, E_Action * a, + void *data, int x, int y, int rx, int ry); -static void e_act_close_start (E_Object *object, E_Action *a, void *data, - int x, int y, int rx, int ry); +static void e_act_kill_start(E_Object * object, E_Action * a, + void *data, int x, int y, int rx, int ry); -static void e_act_kill_start (E_Object *object, E_Action *a, void *data, - int x, int y, int rx, int ry); +static void e_act_shade_start(E_Object * object, E_Action * a, + void *data, int x, int y, int rx, int ry); -static void e_act_shade_start (E_Object *object, E_Action *a, void *data, - int x, int y, int rx, int ry); +static void e_act_raise_start(E_Object * object, E_Action * a, + void *data, int x, int y, int rx, int ry); -static void e_act_raise_start (E_Object *object, E_Action *a, void *data, - int x, int y, int rx, int ry); +static void e_act_lower_start(E_Object * object, E_Action * a, + void *data, int x, int y, int rx, int ry); -static void e_act_lower_start (E_Object *object, E_Action *a, void *data, - int x, int y, int rx, int ry); +static void e_act_raise_lower_start(E_Object * object, E_Action * a, + void *data, int x, int y, int rx, + int ry); -static void e_act_raise_lower_start (E_Object *object, E_Action *a, +static void e_act_exec_start(E_Object * object, E_Action * a, void *data, int x, int y, int rx, int ry); -static void e_act_exec_start (E_Object *object, E_Action *a, void *data, - int x, int y, int rx, int ry); - -static void e_act_menu_start (E_Object *object, E_Action *a, void *data, - int x, int y, int rx, int ry); - -static void e_act_exit_start (E_Object *object, E_Action *a, void *data, - int x, int y, int rx, int ry); - -static void e_act_restart_start (E_Object *object, E_Action *a, void *data, - int x, int y, int rx, int ry); +static void e_act_menu_start(E_Object * object, E_Action * a, + void *data, int x, int y, int rx, int ry); -static void e_act_stick_start (E_Object *object, E_Action *a, void *data, - int x, int y, int rx, int ry); +static void e_act_exit_start(E_Object * object, E_Action * a, + void *data, int x, int y, int rx, int ry); -static void e_act_sound_start (E_Object *object, E_Action *a, void *data, - int x, int y, int rx, int ry); +static void e_act_restart_start(E_Object * object, E_Action * a, + void *data, int x, int y, int rx, + int ry); -static void e_act_iconify_start (E_Object *object, E_Action *a, void *data, - int x, int y, int rx, int ry); +static void e_act_stick_start(E_Object * object, E_Action * a, + void *data, int x, int y, int rx, int ry); -static void e_act_max_start (E_Object *object, E_Action *a, void *data, - int x, int y, int rx, int ry); +static void e_act_sound_start(E_Object * object, E_Action * a, + void *data, int x, int y, int rx, int ry); -static void e_act_snap_start (E_Object *object, E_Action *a, void *data, - int x, int y, int rx, int ry); +static void e_act_iconify_start(E_Object * object, E_Action * a, + void *data, int x, int y, int rx, + int ry); -static void e_act_zoom_start (E_Object *object, E_Action *a, void *data, - int x, int y, int rx, int ry); +static void e_act_max_start(E_Object * object, E_Action * a, void *data, + int x, int y, int rx, int ry); -static void e_act_desk_start (E_Object *object, E_Action *a, void *data, - int x, int y, int rx, int ry); +static void e_act_snap_start(E_Object * object, E_Action * a, + void *data, int x, int y, int rx, int ry); -static void e_act_raise_next_start (E_Object *object, E_Action *a, void *data, - int x, int y, int rx, int ry); +static void e_act_zoom_start(E_Object * object, E_Action * a, + void *data, int x, int y, int rx, int ry); -static void e_act_desk_rel_start (E_Object *object, E_Action *a, void *data, - int x, int y, int rx, int ry); +static void e_act_desk_start(E_Object * object, E_Action * a, + void *data, int x, int y, int rx, int ry); +static void e_act_raise_next_start(E_Object * object, E_Action * a, + void *data, int x, int y, int rx, + int ry); + +static void e_act_desk_rel_start(E_Object * object, E_Action * a, + void *data, int x, int y, int rx, + int ry); static void e_action_find(char *action, E_Action_Type act, int button, - char *key, Ecore_Event_Key_Modifiers mods, E_Object *object) + char *key, Ecore_Event_Key_Modifiers mods, E_Object * object) { - char *actions_db; - E_DB_File *db; - int i, num; - char *a_name = NULL; - char *a_action = NULL; - char *a_params = NULL; - int a_event = 0; - int a_button = 0; - char *a_key = NULL; - int a_modifiers = 0; - Evas_List l; - E_Action *a; - static Evas_List actions = NULL; + char *actions_db; + E_DB_File *db; + int i, num; + char *a_name = NULL; + char *a_action = NULL; + char *a_params = NULL; + int a_event = 0; + int a_button = 0; + char *a_key = NULL; + int a_modifiers = 0; + Evas_List l; + E_Action *a; + static Evas_List actions = NULL; + E_CFG_FILE(cfg_actions, "actions"); D_ENTER; @@ -141,28 +156,31 @@ /* if we had a previous list - nuke it */ /* FIXME: this has potential to segfault if reference - counting is actually used and those actions are - referenced in more than one place --cK. - */ + * counting is actually used and those actions are + * referenced in more than one place --cK. + */ if (actions) { for (l = actions; l; l = l->next) { a = l->data; - if (a) e_action_cleanup(a); + if (a) + e_action_cleanup(a); } actions = evas_list_free(actions); } /* now build the list again */ actions_db = e_config_get("actions"); db = e_db_open_read(actions_db); - if (!db) D_RETURN; - if (!e_db_int_get(db, "/actions/count", &num)) goto error; + if (!db) + D_RETURN; + if (!e_db_int_get(db, "/actions/count", &num)) + goto error; for (i = 0; i < num; i++) { - char buf[PATH_MAX]; - + char buf[PATH_MAX]; + snprintf(buf, PATH_MAX, "/actions/%i/name", i); a_name = e_db_str_get(db, buf); snprintf(buf, PATH_MAX, "/actions/%i/action", i); @@ -177,12 +195,12 @@ a_key = e_db_str_get(db, buf); snprintf(buf, PATH_MAX, "/actions/%i/modifiers", i); e_db_int_get(db, buf, &a_modifiers); - + a = NEW(E_Action, 1); ZERO(a, E_Action, 1); - + e_object_init(E_OBJECT(a), (E_Cleanup_Func) e_action_cleanup); - + a->name = a_name; a->action = a_action; a->params = a_params; @@ -198,52 +216,54 @@ if ((a->key) && (strlen(a->key) > 0)) { if (a->modifiers == -1) - e_keys_grab(a->key, ECORE_EVENT_KEY_MODIFIER_NONE, 1); + e_keys_grab(a->key, ECORE_EVENT_KEY_MODIFIER_NONE, 1); else - e_keys_grab(a->key, (Ecore_Event_Key_Modifiers)a->modifiers, 0); + e_keys_grab(a->key, (Ecore_Event_Key_Modifiers) a->modifiers, + 0); a->grabbed = 1; } } - error: + error: e_db_close(db); E_CONFIG_CHECK_VALIDITY_END; /* run thru our actions list and match event, state and stuff with an */ /* and action for it */ for (l = actions; l; l = l->next) { - Evas_List ll; - + Evas_List ll; + a = l->data; - if (act != a->event) goto next; - if (!((a->name) && - (action) && - (!strcmp(a->name, action)))) goto next; - if ((act >= ACT_MOUSE_CLICK) && - (act <= ACT_MOUSE_CLICKED) && - (!((a->button == -1) || - (a->button == button)))) goto next; - if ((act >= ACT_KEY_DOWN) && + if (act != a->event) + goto next; + if (!((a->name) && (action) && (!strcmp(a->name, action)))) + goto next; + if ((act >= ACT_MOUSE_CLICK) && + (act <= ACT_MOUSE_CLICKED) && + (!((a->button == -1) || (a->button == button)))) + goto next; + if ((act >= ACT_KEY_DOWN) && (act <= ACT_KEY_UP) && - (!((a->key) && (key) && - (!strcmp(a->key, key))))) goto next; + (!((a->key) && (key) && (!strcmp(a->key, key))))) + goto next; if ((act >= ACT_MOUSE_CLICK) && (act <= ACT_KEY_UP) && - (!((a->modifiers == -1) || - (a->modifiers == (int)mods)))) goto next; + (!((a->modifiers == -1) || (a->modifiers == (int)mods)))) + goto next; for (ll = action_impls; ll; ll = ll->next) { - E_Action_Impl *ap; - + E_Action_Impl *ap; + ap = ll->data; if (!strcmp(ap->action, a->action)) { - E_Action *aa; - + E_Action *aa; + aa = NEW(E_Action, 1); ZERO(aa, E_Action, 1); - - e_object_init(E_OBJECT(aa), (E_Cleanup_Func) e_action_cleanup); - + + e_object_init(E_OBJECT(aa), + (E_Cleanup_Func) e_action_cleanup); + e_strdup(aa->name, a->name); e_strdup(aa->action, a->action); e_strdup(aa->params, a->params); @@ -262,14 +282,14 @@ current_actions = evas_list_append(current_actions, aa); } } - next: + next: } D_RETURN; } static void -e_action_cleanup(E_Action *a) +e_action_cleanup(E_Action * a) { D_ENTER; @@ -277,9 +297,9 @@ if ((a->key) && (strlen(a->key) > 0) && (a->grabbed)) { if (a->modifiers == -1) - e_keys_ungrab(a->key, ECORE_EVENT_KEY_MODIFIER_NONE, 1); + e_keys_ungrab(a->key, ECORE_EVENT_KEY_MODIFIER_NONE, 1); else - e_keys_ungrab(a->key, (Ecore_Event_Key_Modifiers)a->modifiers, 0); + e_keys_ungrab(a->key, (Ecore_Event_Key_Modifiers) a->modifiers, 0); } /* Clean up the strings by simply freeing them ... */ @@ -289,19 +309,19 @@ IF_FREE(a->key); /* Cleanup action implementations and objects. These - we don't free directly, but just decrement their use counts. - */ + * we don't free directly, but just decrement their use counts. + */ if (a->action_impl) { - e_object_unref(E_OBJECT(a->action_impl)); - a->action_impl = NULL; + e_object_unref(E_OBJECT(a->action_impl)); + a->action_impl = NULL; } if (a->object) { - e_object_unref(a->object); - a->object = NULL; + e_object_unref(a->object); + a->object = NULL; } /* Cleanup superclass. */ @@ -313,19 +333,19 @@ int e_action_start(char *action, E_Action_Type act, int button, char *key, Ecore_Event_Key_Modifiers mods, - E_Object *object, void *data, int x, int y, int rx, int ry) + E_Object * object, void *data, int x, int y, int rx, int ry) { - Evas_List l; - int started_long_action = 0; - + Evas_List l; + int started_long_action = 0; + D_ENTER; e_action_find(action, act, button, key, mods, object); - again: + again: for (l = current_actions; l; l = l->next) { - E_Action *a; - + E_Action *a; + a = l->data; if (!a->started) { @@ -352,49 +372,44 @@ void e_action_stop(char *action, E_Action_Type act, int button, - char *key, Ecore_Event_Key_Modifiers mods, E_Object *object, + char *key, Ecore_Event_Key_Modifiers mods, E_Object * object, void *data, int x, int y, int rx, int ry) { - Evas_List l; + Evas_List l; D_ENTER; - again: + again: for (l = current_actions; l; l = l->next) { - E_Action *a; - + E_Action *a; + a = l->data; if ((a->started) && (a->action_impl->func_stop)) { - int ok = 0; - - if ((a->event == ACT_MOUSE_IN) && - (act == ACT_MOUSE_OUT)) - ok = 1; - if ((a->event == ACT_MOUSE_OUT) && - (act == ACT_MOUSE_IN)) - ok = 1; - if ((a->event >= ACT_MOUSE_CLICK) && + int ok = 0; + + if ((a->event == ACT_MOUSE_IN) && (act == ACT_MOUSE_OUT)) + ok = 1; + if ((a->event == ACT_MOUSE_OUT) && (act == ACT_MOUSE_IN)) + ok = 1; + if ((a->event >= ACT_MOUSE_CLICK) && (a->event <= ACT_MOUSE_TRIPLE) && (act >= ACT_MOUSE_UP) && - (act <= ACT_MOUSE_CLICKED) && - (a->button == button)) - ok = 1; - if ((a->event == ACT_MOUSE_MOVE) && + (act <= ACT_MOUSE_CLICKED) && (a->button == button)) + ok = 1; + if ((a->event == ACT_MOUSE_MOVE) && ((act == ACT_MOUSE_OUT) || (act == ACT_MOUSE_IN) || ((act >= ACT_MOUSE_CLICK) && - (act <= ACT_MOUSE_TRIPLE)) || - (act >= ACT_MOUSE_UP))) - ok = 1; - if ((a->event == ACT_KEY_DOWN) && + (act <= ACT_MOUSE_TRIPLE)) || (act >= ACT_MOUSE_UP))) + ok = 1; + if ((a->event == ACT_KEY_DOWN) && (act == ACT_KEY_UP) && (key) && (a->key) && (!strcmp(key, a->key))) - ok = 1; - if ((a->event == ACT_KEY_UP) && - (act == ACT_KEY_DOWN)) - ok = 1; + ok = 1; + if ((a->event == ACT_KEY_UP) && (act == ACT_KEY_DOWN)) + ok = 1; if (ok) { a->action_impl->func_stop(a->object, a, data, x, y, rx, ry); @@ -403,7 +418,7 @@ } if (!a->started) { - current_actions = evas_list_remove(current_actions, a); + current_actions = evas_list_remove(current_actions, a); e_object_unref(E_OBJECT(a)); goto again; } @@ -417,20 +432,20 @@ void e_action_cont(char *action, E_Action_Type act, int button, char *key, - Ecore_Event_Key_Modifiers mods, E_Object *object, void *data, + Ecore_Event_Key_Modifiers mods, E_Object * object, void *data, int x, int y, int rx, int ry, int dx, int dy) { - Evas_List l; + Evas_List l; D_ENTER; for (l = current_actions; l; l = l->next) { - E_Action *a; - + E_Action *a; + a = l->data; if ((a->started) && (a->action_impl->func_cont)) - a->action_impl->func_cont(a->object, a, data, x, y, rx, ry, dx, dy); + a->action_impl->func_cont(a->object, a, data, x, y, rx, ry, dx, dy); } D_RETURN; @@ -443,24 +458,25 @@ } void -e_action_stop_by_object(E_Object *object, void *data, int x, int y, int rx, int ry) +e_action_stop_by_object(E_Object * object, void *data, int x, int y, int rx, + int ry) { - Evas_List l; + Evas_List l; D_ENTER; e_action_del_timer_object(object); - again: + again: for (l = current_actions; l; l = l->next) { - E_Action *a; - + E_Action *a; + a = l->data; if ((a->started) && (object == a->object)) { if (a->action_impl->func_stop) - a->action_impl->func_stop(a->object, a, data, x, y, rx, ry); + a->action_impl->func_stop(a->object, a, data, x, y, rx, ry); a->started = 0; @@ -477,16 +493,16 @@ void e_action_stop_by_type(char *action) { - Evas_List l; + Evas_List l; D_ENTER; for (l = current_actions; l; l = l->next) { - E_Action *a; - + E_Action *a; + a = l->data; - if ((a->started) && (a->action_impl->func_stop) && + if ((a->started) && (a->action_impl->func_stop) && (action) && (!strcmp(action, a->name))) { a->action_impl->func_stop(a->object, a, NULL, 0, 0, 0, 0); @@ -497,9 +513,8 @@ D_RETURN; } - static void -e_action_impl_cleanup(E_Action_Impl *eai) +e_action_impl_cleanup(E_Action_Impl * eai) { D_ENTER; @@ -508,20 +523,19 @@ D_RETURN; } - void -e_action_add_impl(char *action, E_Action_Start_Func func_start, +e_action_add_impl(char *action, E_Action_Start_Func func_start, E_Action_Cont_Func func_cont, E_Action_Stop_Func func_stop) { - E_Action_Impl *ap; - + E_Action_Impl *ap; + D_ENTER; ap = NEW(E_Action_Impl, 1); - ZERO(ap, E_Action_Impl, 1); + ZERO(ap, E_Action_Impl, 1); e_object_init(E_OBJECT(ap), (E_Cleanup_Func) e_action_impl_cleanup); - + e_strdup(ap->action, action); ap->func_start = func_start; ap->func_cont = func_cont; @@ -531,24 +545,21 @@ D_RETURN; } - void -e_action_del_timer(E_Object *object, char *name) +e_action_del_timer(E_Object * object, char *name) { - Evas_List l; + Evas_List l; D_ENTER; - - again: + + again: for (l = current_timers; l; l = l->next) { E_Active_Action_Timer *at; - + at = l->data; - if ((at->object == object) && - (name) && - (at->name) && - (!strcmp(at->name, name))) + if ((at->object == object) && + (name) && (at->name) && (!strcmp(at->name, name))) { e_object_unref(at->object); ecore_del_event_timer(at->name); @@ -563,10 +574,10 @@ } void -e_action_add_timer(E_Object *object, char *name) +e_action_add_timer(E_Object * object, char *name) { E_Active_Action_Timer *at; - + D_ENTER; at = NEW(E_Active_Action_Timer, 1); @@ -579,17 +590,17 @@ } void -e_action_del_timer_object(E_Object *object) +e_action_del_timer_object(E_Object * object) { - Evas_List l; - + Evas_List l; + D_ENTER; - again: + again: for (l = current_timers; l; l = l->next) { E_Active_Action_Timer *at; - + at = l->data; if (at->object == object) { @@ -601,7 +612,7 @@ goto again; } } - + D_RETURN; } @@ -610,10 +621,14 @@ { D_ENTER; - e_action_add_impl("Window_Move", e_act_move_start, e_act_move_cont, e_act_move_stop); - e_action_add_impl("Window_Resize", e_act_resize_start, e_act_resize_cont, e_act_resize_stop); - e_action_add_impl("Window_Resize_Horizontal", e_act_resize_h_start, e_act_resize_h_cont, e_act_resize_h_stop); - e_action_add_impl("Window_Resize_Vertical", e_act_resize_v_start, e_act_resize_v_cont, e_act_resize_v_stop); + e_action_add_impl("Window_Move", e_act_move_start, e_act_move_cont, + e_act_move_stop); + e_action_add_impl("Window_Resize", e_act_resize_start, e_act_resize_cont, + e_act_resize_stop); + e_action_add_impl("Window_Resize_Horizontal", e_act_resize_h_start, + e_act_resize_h_cont, e_act_resize_h_stop); + e_action_add_impl("Window_Resize_Vertical", e_act_resize_v_start, + e_act_resize_v_cont, e_act_resize_v_stop); e_action_add_impl("Window_Close", e_act_close_start, NULL, NULL); e_action_add_impl("Window_Kill", e_act_kill_start, NULL, NULL); e_action_add_impl("Window_Shade", e_act_shade_start, NULL, NULL); @@ -637,7 +652,6 @@ D_RETURN; } - /* FIXME: these REALLY need to go into other file(s) but it's not worht it */ /* yet at this point. it can be done later */ @@ -653,21 +667,26 @@ /* probably moving these includes above the init and having hooks into the */ /* init func */ -static void -e_act_move_start (E_Object *object, E_Action *a, void *data, int x, int y, int rx, int ry) +static void +e_act_move_start(E_Object * object, E_Action * a, void *data, int x, int y, + int rx, int ry) { - E_Border *b; - E_Guides_Mode move_mode = E_GUIDES_BOX; - double align_x = 0.5; - double align_y = 0.5; - E_Guides_Location display_loc = E_GUIDES_DISPLAY_LOCATION_WINDOW_MIDDLE; - E_CFG_INT(cfg_window_move_mode, "settings", "/window/move/mode", E_GUIDES_BOX); + E_Border *b; + E_Guides_Mode move_mode = E_GUIDES_BOX; + double align_x = 0.5; + double align_y = 0.5; + E_Guides_Location display_loc = E_GUIDES_DISPLAY_LOCATION_WINDOW_MIDDLE; + + E_CFG_INT(cfg_window_move_mode, "settings", "/window/move/mode", + E_GUIDES_BOX); E_CFG_FLOAT(cfg_guides_display_x, "settings", "/guides/display/x", 0.5); E_CFG_FLOAT(cfg_guides_display_y, "settings", "/guides/display/y", 0.5); - E_CFG_INT(cfg_guides_display_location, "settings", "/guides/display/location", E_GUIDES_DISPLAY_LOCATION_WINDOW_MIDDLE); - + E_CFG_INT(cfg_guides_display_location, "settings", + "/guides/display/location", + E_GUIDES_DISPLAY_LOCATION_WINDOW_MIDDLE); + D_ENTER; - + e_block_start("menus"); E_CONFIG_INT_GET(cfg_window_move_mode, move_mode); @@ -675,39 +694,40 @@ E_CONFIG_FLOAT_GET(cfg_guides_display_y, align_y); E_CONFIG_INT_GET(cfg_guides_display_location, display_loc); - b = (E_Border*) object; + b = (E_Border *) object; if (!b) - b = e_border_current_focused(); + b = e_border_current_focused(); if (!b) - D_RETURN; + D_RETURN; if (b->client.fixed) - D_RETURN; + D_RETURN; if (move_mode >= E_GUIDES_BOX) - b->hold_changes = 1; /* if non opaque */ + b->hold_changes = 1; /* if non opaque */ b->mode.move = 1; b->current.requested.dx = 0; b->current.requested.dy = 0; b->previous.requested.dx = 0; b->previous.requested.dy = 0; - { - char buf[PATH_MAX]; - - e_border_print_pos(buf, b); - e_guides_set_display_alignment(align_x, align_y); - e_guides_set_mode(move_mode); - e_guides_set_display_location(display_loc); - e_guides_display_text(buf); - snprintf(buf, PATH_MAX, "%s/%s", e_config_get("images"), "win_shadow_icon.png"); - e_guides_display_icon(buf); - e_guides_move(b->current.x, b->current.y); - e_guides_resize(b->current.w, b->current.h); - e_guides_show(); - } + { + char buf[PATH_MAX]; + + e_border_print_pos(buf, b); + e_guides_set_display_alignment(align_x, align_y); + e_guides_set_mode(move_mode); + e_guides_set_display_location(display_loc); + e_guides_display_text(buf); + snprintf(buf, PATH_MAX, "%s/%s", e_config_get("images"), + "win_shadow_icon.png"); + e_guides_display_icon(buf); + e_guides_move(b->current.x, b->current.y); + e_guides_resize(b->current.w, b->current.h); + e_guides_show(); + } D_RETURN; UN(a); @@ -719,26 +739,27 @@ } static void -e_act_move_stop (E_Object *object, E_Action *a, void *data, int x, int y, int rx, int ry) +e_act_move_stop(E_Object * object, E_Action * a, void *data, int x, int y, + int rx, int ry) { - E_Border *b; + E_Border *b; D_ENTER; - b = (E_Border*) object; + b = (E_Border *) object; e_block_stop("menus"); - + if (!b) - b = e_border_current_focused(); + b = e_border_current_focused(); if (!b) - D_RETURN; + D_RETURN; if (b->client.fixed) - D_RETURN; + D_RETURN; - b->hold_changes = 0; /* if non opaque */ + b->hold_changes = 0; /* if non opaque */ b->current.requested.x = b->current.x; b->current.requested.y = b->current.y; b->changed = 1; @@ -764,37 +785,40 @@ } static void -e_act_move_cont (E_Object *object, E_Action *a, void *data, int x, int y, int rx, int ry, int dx, int dy) +e_act_move_cont(E_Object * object, E_Action * a, void *data, int x, int y, + int rx, int ry, int dx, int dy) { - E_Border *b; + E_Border *b; D_ENTER; - - b = (E_Border*) object; + + b = (E_Border *) object; if (!b) - b = e_border_current_focused(); + b = e_border_current_focused(); if (!b) - D_RETURN; + D_RETURN; if (b->client.fixed) - D_RETURN; + D_RETURN; b->current.requested.x += dx; b->current.requested.y += dy; - if (dx != 0) b->current.requested.dx = dx; - if (dy != 0) b->current.requested.dy = dy; + if (dx != 0) + b->current.requested.dx = dx; + if (dy != 0) + b->current.requested.dy = dy; b->changed = 1; e_border_adjust_limits(b); - { - char buf[1024]; - - e_border_print_pos(buf, b); - e_guides_move(b->current.x, b->current.y); - e_guides_resize(b->current.w, b->current.h); - e_guides_display_text(buf); - } + { + char buf[1024]; + + e_border_print_pos(buf, b); + e_guides_move(b->current.x, b->current.y); + e_guides_resize(b->current.w, b->current.h); + e_guides_display_text(buf); + } D_RETURN; UN(a); @@ -805,36 +829,45 @@ UN(ry); } - -static void -e_act_resize_start (E_Object *object, E_Action *a, void *data, int x, int y, int rx, int ry) +static void +e_act_resize_start(E_Object * object, E_Action * a, void *data, int x, int y, + int rx, int ry) { - E_Border *b; - E_Guides_Mode resize_mode = E_GUIDES_BOX; - double align_x = 0.5; - double align_y = 0.5; - E_Guides_Location display_loc = E_GUIDES_DISPLAY_LOCATION_WINDOW_MIDDLE; - E_CFG_INT(cfg_window_resize_mode, "settings", "/window/resize/mode", E_GUIDES_BOX); + E_Border *b; + E_Guides_Mode resize_mode = E_GUIDES_BOX; + double align_x = 0.5; + double align_y = 0.5; + E_Guides_Location display_loc = E_GUIDES_DISPLAY_LOCATION_WINDOW_MIDDLE; + + E_CFG_INT(cfg_window_resize_mode, "settings", "/window/resize/mode", + E_GUIDES_BOX); E_CFG_FLOAT(cfg_guides_display_x, "settings", "/guides/display/x", 0.5); E_CFG_FLOAT(cfg_guides_display_y, "settings", "/guides/display/y", 0.5); - E_CFG_INT(cfg_guides_display_location, "settings", "/guides/display/location", E_GUIDES_DISPLAY_LOCATION_WINDOW_MIDDLE); + E_CFG_INT(cfg_guides_display_location, "settings", + "/guides/display/location", + E_GUIDES_DISPLAY_LOCATION_WINDOW_MIDDLE); D_ENTER; e_block_start("menus"); - + E_CONFIG_INT_GET(cfg_window_resize_mode, resize_mode); E_CONFIG_FLOAT_GET(cfg_guides_display_x, align_x); - E_CONFIG_FLOAT_GET(cfg_guides_display_y, align_y); + E_CONFIG_FLOAT_GET(cfg_guides_display_y, align_y); E_CONFIG_INT_GET(cfg_guides_display_location, display_loc); - b = (E_Border*) object; - if (!b) b = e_border_current_focused(); - if (!b) D_RETURN; - if (b->client.min.w == b->client.max.w) D_RETURN; - if (b->client.min.h == b->client.max.h) D_RETURN; - if (b->current.shaded != 0) D_RETURN; + b = (E_Border *) object; + if (!b) + b = e_border_current_focused(); + if (!b) + D_RETURN; + if (b->client.min.w == b->client.max.w) + D_RETURN; + if (b->client.min.h == b->client.max.h) + D_RETURN; + if (b->current.shaded != 0) + D_RETURN; if (resize_mode >= E_GUIDES_BOX) - b->hold_changes = 1; /* if non opaque */ + b->hold_changes = 1; /* if non opaque */ ecore_window_gravity_set(b->win.client, StaticGravity); ecore_window_gravity_set(b->win.l, NorthWestGravity); ecore_window_gravity_set(b->win.r, SouthEastGravity); @@ -845,50 +878,51 @@ /* 1 | 2 */ /* --+-- */ /* 3 | 4 */ - if (x > (b->current.w / 2)) + if (x > (b->current.w / 2)) { - if (y > (b->current.h / 2)) + if (y > (b->current.h / 2)) { b->mode.resize = 4; - /* e_border_set_gravity(b, NorthWestGravity); */ - /* ecore_window_gravity_set(b->win.container, SouthEastGravity);*/ + /* e_border_set_gravity(b, NorthWestGravity); */ + /* ecore_window_gravity_set(b->win.container, SouthEastGravity); */ } - else + else { b->mode.resize = 2; - /* e_border_set_gravity(b, SouthWestGravity);*/ - /* ecore_window_gravity_set(b->win.container, NorthEastGravity);*/ + /* e_border_set_gravity(b, SouthWestGravity); */ + /* ecore_window_gravity_set(b->win.container, NorthEastGravity); */ } } else { - if (y > (b->current.h / 2)) + if (y > (b->current.h / 2)) { b->mode.resize = 3; /* e_border_set_gravity(b, NorthEastGravity);*/ /* ecore_window_gravity_set(b->win.container, SouthWestGravity);*/ } - else + else { b->mode.resize = 1; /* e_border_set_gravity(b, SouthEastGravity);*/ /* ecore_window_gravity_set(b->win.container, NorthWestGravity); */ } } - { - char buf[PATH_MAX]; - - e_border_print_size(buf, b); - e_guides_set_display_alignment(align_x, align_y); - e_guides_set_mode(resize_mode); - e_guides_set_display_location(display_loc); - e_guides_display_text(buf); - snprintf(buf, PATH_MAX, "%s/%s", e_config_get("images"), "win_shadow_icon.png"); - e_guides_display_icon(buf); - e_guides_move(b->current.x, b->current.y); - e_guides_resize(b->current.w, b->current.h); - e_guides_show(); - } + { + char buf[PATH_MAX]; + + e_border_print_size(buf, b); + e_guides_set_display_alignment(align_x, align_y); + e_guides_set_mode(resize_mode); + e_guides_set_display_location(display_loc); + e_guides_display_text(buf); + snprintf(buf, PATH_MAX, "%s/%s", e_config_get("images"), + "win_shadow_icon.png"); + e_guides_display_icon(buf); + e_guides_move(b->current.x, b->current.y); + e_guides_resize(b->current.w, b->current.h); + e_guides_show(); + } D_RETURN; UN(a); @@ -898,21 +932,27 @@ } static void -e_act_resize_stop (E_Object *object, E_Action *a, void *data, int x, int y, int rx, int ry) +e_act_resize_stop(E_Object * object, E_Action * a, void *data, int x, int y, + int rx, int ry) { - E_Border *b; - + E_Border *b; + D_ENTER; e_block_stop("menus"); - b = (E_Border*) object; - if (!b) b = e_border_current_focused(); - if (!b) D_RETURN; - if (b->client.min.w == b->client.max.w) D_RETURN; - if (b->client.min.h == b->client.max.h) D_RETURN; - if (b->current.shaded != 0) D_RETURN; - b->hold_changes = 0; /* if non opaque */ + b = (E_Border *) object; + if (!b) + b = e_border_current_focused(); + if (!b) + D_RETURN; + if (b->client.min.w == b->client.max.w) + D_RETURN; + if (b->client.min.h == b->client.max.h) + D_RETURN; + if (b->current.shaded != 0) + D_RETURN; + b->hold_changes = 0; /* if non opaque */ b->current.requested.x = b->current.x; b->current.requested.y = b->current.y; b->current.requested.w = b->current.w; @@ -934,18 +974,24 @@ } static void -e_act_resize_cont (E_Object *object, E_Action *a, void *data, int x, int y, int rx, int ry, int dx, int dy) +e_act_resize_cont(E_Object * object, E_Action * a, void *data, int x, int y, + int rx, int ry, int dx, int dy) { - E_Border *b; + E_Border *b; D_ENTER; - - b = (E_Border*) object; - if (!b) b = e_border_current_focused(); - if (!b) D_RETURN; - if (b->client.min.w == b->client.max.w) D_RETURN; - if (b->client.min.h == b->client.max.h) D_RETURN; - if (b->current.shaded != 0) D_RETURN; + + b = (E_Border *) object; + if (!b) + b = e_border_current_focused(); + if (!b) + D_RETURN; + if (b->client.min.w == b->client.max.w) + D_RETURN; + if (b->client.min.h == b->client.max.h) + D_RETURN; + if (b->current.shaded != 0) + D_RETURN; if (b->mode.resize == 1) { b->current.requested.w -= dx; @@ -972,14 +1018,14 @@ } b->changed = 1; e_border_adjust_limits(b); - { - char buf[1024]; - - e_border_print_size(buf, b); - e_guides_move(b->current.x, b->current.y); - e_guides_resize(b->current.w, b->current.h); - e_guides_display_text(buf); - } + { + char buf[1024]; + + e_border_print_size(buf, b); + e_guides_move(b->current.x, b->current.y); + e_guides_resize(b->current.w, b->current.h); + e_guides_display_text(buf); + } D_RETURN; UN(a); @@ -990,35 +1036,43 @@ UN(ry); } - -static void -e_act_resize_h_start (E_Object *object, E_Action *a, void *data, int x, int y, int rx, int ry) +static void +e_act_resize_h_start(E_Object * object, E_Action * a, void *data, int x, int y, + int rx, int ry) { - E_Border *b; - E_Guides_Mode resize_mode = E_GUIDES_BOX; - double align_x = 0.5; - double align_y = 0.5; - E_Guides_Location display_loc = E_GUIDES_DISPLAY_LOCATION_WINDOW_MIDDLE; - E_CFG_INT(cfg_window_resize_mode, "settings", "/window/resize/mode", E_GUIDES_BOX); + E_Border *b; + E_Guides_Mode resize_mode = E_GUIDES_BOX; + double align_x = 0.5; + double align_y = 0.5; + E_Guides_Location display_loc = E_GUIDES_DISPLAY_LOCATION_WINDOW_MIDDLE; + + E_CFG_INT(cfg_window_resize_mode, "settings", "/window/resize/mode", + E_GUIDES_BOX); E_CFG_FLOAT(cfg_guides_display_x, "settings", "/guides/display/x", 0.5); E_CFG_FLOAT(cfg_guides_display_y, "settings", "/guides/display/y", 0.5); - E_CFG_INT(cfg_guides_display_location, "settings", "/guides/display/location", E_GUIDES_DISPLAY_LOCATION_WINDOW_MIDDLE); + E_CFG_INT(cfg_guides_display_location, "settings", + "/guides/display/location", + E_GUIDES_DISPLAY_LOCATION_WINDOW_MIDDLE); D_ENTER; e_block_start("menus"); - + E_CONFIG_INT_GET(cfg_window_resize_mode, resize_mode); E_CONFIG_FLOAT_GET(cfg_guides_display_x, align_x); - E_CONFIG_FLOAT_GET(cfg_guides_display_y, align_y); + E_CONFIG_FLOAT_GET(cfg_guides_display_y, align_y); E_CONFIG_INT_GET(cfg_guides_display_location, display_loc); - b = (E_Border*) object; - if (!b) b = e_border_current_focused(); - if (!b) D_RETURN; - if (b->client.min.w == b->client.max.w) D_RETURN; - if (b->current.shaded != 0) D_RETURN; + b = (E_Border *) object; + if (!b) + b = e_border_current_focused(); + if (!b) + D_RETURN; + if (b->client.min.w == b->client.max.w) + D_RETURN; + if (b->current.shaded != 0) + D_RETURN; if (resize_mode >= E_GUIDES_BOX) - b->hold_changes = 1; /* if non opaque */ + b->hold_changes = 1; /* if non opaque */ ecore_window_gravity_set(b->win.client, StaticGravity); ecore_window_gravity_set(b->win.l, NorthWestGravity); ecore_window_gravity_set(b->win.r, SouthEastGravity); @@ -1027,30 +1081,31 @@ ecore_window_gravity_set(b->win.input, NorthWestGravity); ecore_window_gravity_set(b->win.container, NorthWestGravity); /* 5 | 6 */ - if (x > (b->current.w / 2)) + if (x > (b->current.w / 2)) { b->mode.resize = 6; /* e_border_set_gravity(b, NorthWestGravity);*/ } - else + else { b->mode.resize = 5; /* e_border_set_gravity(b, NorthEastGravity);*/ } - { - char buf[PATH_MAX]; - - e_border_print_size(buf, b); - e_guides_set_display_alignment(align_x, align_y); - e_guides_set_mode(resize_mode); - e_guides_set_display_location(display_loc); - e_guides_display_text(buf); - snprintf(buf, PATH_MAX, "%s/%s", e_config_get("images"), "win_shadow_icon.png"); - e_guides_display_icon(buf); - e_guides_move(b->current.x, b->current.y); - e_guides_resize(b->current.w, b->current.h); - e_guides_show(); - } + { + char buf[PATH_MAX]; + + e_border_print_size(buf, b); + e_guides_set_display_alignment(align_x, align_y); + e_guides_set_mode(resize_mode); + e_guides_set_display_location(display_loc); + e_guides_display_text(buf); + snprintf(buf, PATH_MAX, "%s/%s", e_config_get("images"), + "win_shadow_icon.png"); + e_guides_display_icon(buf); + e_guides_move(b->current.x, b->current.y); + e_guides_resize(b->current.w, b->current.h); + e_guides_show(); + } D_RETURN; UN(a); @@ -1061,20 +1116,25 @@ } static void -e_act_resize_h_stop (E_Object *object, E_Action *a, void *data, int x, int y, int rx, int ry) +e_act_resize_h_stop(E_Object * object, E_Action * a, void *data, int x, int y, + int rx, int ry) { - E_Border *b; + E_Border *b; D_ENTER; e_block_stop("menus"); - - b = (E_Border*) object; - if (!b) b = e_border_current_focused(); - if (!b) D_RETURN; - if (b->client.min.w == b->client.max.w) D_RETURN; - if (b->current.shaded != 0) D_RETURN; - b->hold_changes = 0; /* if non opaque */ + + b = (E_Border *) object; + if (!b) + b = e_border_current_focused(); + if (!b) + D_RETURN; + if (b->client.min.w == b->client.max.w) + D_RETURN; + if (b->current.shaded != 0) + D_RETURN; + b->hold_changes = 0; /* if non opaque */ b->current.requested.x = b->current.x; b->current.requested.y = b->current.y; b->current.requested.w = b->current.w; @@ -1096,17 +1156,22 @@ } static void -e_act_resize_h_cont (E_Object *object, E_Action *a, void *data, int x, int y, int rx, int ry, int dx, int dy) +e_act_resize_h_cont(E_Object * object, E_Action * a, void *data, int x, int y, + int rx, int ry, int dx, int dy) { - E_Border *b; - + E_Border *b; + D_ENTER; - b = (E_Border*) object; - if (!b) b = e_border_current_focused(); - if (!b) D_RETURN; - if (b->client.min.w == b->client.max.w) D_RETURN; - if (b->current.shaded != 0) D_RETURN; + b = (E_Border *) object; + if (!b) + b = e_border_current_focused(); + if (!b) + D_RETURN; + if (b->client.min.w == b->client.max.w) + D_RETURN; + if (b->current.shaded != 0) + D_RETURN; if (b->mode.resize == 5) { b->current.requested.w -= dx; @@ -1118,14 +1183,14 @@ } b->changed = 1; e_border_adjust_limits(b); - { - char buf[1024]; - - e_border_print_size(buf, b); - e_guides_move(b->current.x, b->current.y); - e_guides_resize(b->current.w, b->current.h); - e_guides_display_text(buf); - } + { + char buf[1024]; + + e_border_print_size(buf, b); + e_guides_move(b->current.x, b->current.y); + e_guides_resize(b->current.w, b->current.h); + e_guides_display_text(buf); + } D_RETURN; UN(a); UN(data); @@ -1136,35 +1201,43 @@ UN(dy); } - -static void -e_act_resize_v_start (E_Object *object, E_Action *a, void *data, int x, int y, int rx, int ry) +static void +e_act_resize_v_start(E_Object * object, E_Action * a, void *data, int x, int y, + int rx, int ry) { - E_Border *b; - E_Guides_Mode resize_mode = E_GUIDES_BOX; - double align_x = 0.5; - double align_y = 0.5; - E_Guides_Location display_loc = E_GUIDES_DISPLAY_LOCATION_WINDOW_MIDDLE; - E_CFG_INT(cfg_window_resize_mode, "settings", "/window/resize/mode", E_GUIDES_BOX); + E_Border *b; + E_Guides_Mode resize_mode = E_GUIDES_BOX; + double align_x = 0.5; + double align_y = 0.5; + E_Guides_Location display_loc = E_GUIDES_DISPLAY_LOCATION_WINDOW_MIDDLE; + + E_CFG_INT(cfg_window_resize_mode, "settings", "/window/resize/mode", + E_GUIDES_BOX); E_CFG_FLOAT(cfg_guides_display_x, "settings", "/guides/display/x", 0.5); E_CFG_FLOAT(cfg_guides_display_y, "settings", "/guides/display/y", 0.5); - E_CFG_INT(cfg_guides_display_location, "settings", "/guides/display/location", E_GUIDES_DISPLAY_LOCATION_WINDOW_MIDDLE); - + E_CFG_INT(cfg_guides_display_location, "settings", + "/guides/display/location", + E_GUIDES_DISPLAY_LOCATION_WINDOW_MIDDLE); + D_ENTER; - + e_block_start("menus"); - + E_CONFIG_INT_GET(cfg_window_resize_mode, resize_mode); E_CONFIG_FLOAT_GET(cfg_guides_display_x, align_x); - E_CONFIG_FLOAT_GET(cfg_guides_display_y, align_y); + E_CONFIG_FLOAT_GET(cfg_guides_display_y, align_y); E_CONFIG_INT_GET(cfg_guides_display_location, display_loc); - b = (E_Border*) object; - if (!b) b = e_border_current_focused(); - if (!b) D_RETURN; - if (b->client.min.h == b->client.max.h) D_RETURN; - if (b->current.shaded != 0) D_RETURN; + b = (E_Border *) object; + if (!b) + b = e_border_current_focused(); + if (!b) + D_RETURN; + if (b->client.min.h == b->client.max.h) + D_RETURN; + if (b->current.shaded != 0) + D_RETURN; if (resize_mode >= E_GUIDES_BOX) - b->hold_changes = 1; /* if non opaque */ + b->hold_changes = 1; /* if non opaque */ ecore_window_gravity_set(b->win.client, StaticGravity); ecore_window_gravity_set(b->win.l, NorthWestGravity); ecore_window_gravity_set(b->win.r, SouthEastGravity); @@ -1175,30 +1248,31 @@ /* 7 */ /* - */ /* 8 */ - if (y > (b->current.h / 2)) + if (y > (b->current.h / 2)) { b->mode.resize = 8; /* e_border_set_gravity(b, NorthWestGravity);*/ } - else + else { b->mode.resize = 7; /* e_border_set_gravity(b, SouthWestGravity);*/ } - { - char buf[PATH_MAX]; - - e_border_print_size(buf, b); - e_guides_set_display_alignment(align_x, align_y); - e_guides_set_mode(resize_mode); - e_guides_set_display_location(display_loc); - e_guides_display_text(buf); - snprintf(buf, PATH_MAX, "%s/%s", e_config_get("images"), "win_shadow_icon.png"); - e_guides_display_icon(buf); - e_guides_move(b->current.x, b->current.y); - e_guides_resize(b->current.w, b->current.h); - e_guides_show(); - } + { + char buf[PATH_MAX]; + + e_border_print_size(buf, b); + e_guides_set_display_alignment(align_x, align_y); + e_guides_set_mode(resize_mode); + e_guides_set_display_location(display_loc); + e_guides_display_text(buf); + snprintf(buf, PATH_MAX, "%s/%s", e_config_get("images"), + "win_shadow_icon.png"); + e_guides_display_icon(buf); + e_guides_move(b->current.x, b->current.y); + e_guides_resize(b->current.w, b->current.h); + e_guides_show(); + } D_RETURN; UN(a); UN(data); @@ -1208,20 +1282,25 @@ } static void -e_act_resize_v_stop (E_Object *object, E_Action *a, void *data, int x, int y, int rx, int ry) +e_act_resize_v_stop(E_Object * object, E_Action * a, void *data, int x, int y, + int rx, int ry) { - E_Border *b; - + E_Border *b; + D_ENTER; e_block_stop("menus"); - - b = (E_Border*) object; - if (!b) b = e_border_current_focused(); - if (!b) D_RETURN; - if (b->client.min.h == b->client.max.h) D_RETURN; - if (b->current.shaded != 0) D_RETURN; - b->hold_changes = 0; /* if non opaque */ + + b = (E_Border *) object; + if (!b) + b = e_border_current_focused(); + if (!b) + D_RETURN; + if (b->client.min.h == b->client.max.h) + D_RETURN; + if (b->current.shaded != 0) + D_RETURN; + b->hold_changes = 0; /* if non opaque */ b->current.requested.x = b->current.x; b->current.requested.y = b->current.y; b->current.requested.w = b->current.w; @@ -1242,17 +1321,22 @@ } static void -e_act_resize_v_cont (E_Object *object, E_Action *a, void *data, int x, int y, int rx, int ry, int dx, int dy) +e_act_resize_v_cont(E_Object * object, E_Action * a, void *data, int x, int y, + int rx, int ry, int dx, int dy) { - E_Border *b; - + E_Border *b; + D_ENTER; - b = (E_Border*) object; - if (!b) b = e_border_current_focused(); - if (!b) D_RETURN; - if (b->client.min.h == b->client.max.h) D_RETURN; - if (b->current.shaded != 0) D_RETURN; + b = (E_Border *) object; + if (!b) + b = e_border_current_focused(); + if (!b) + D_RETURN; + if (b->client.min.h == b->client.max.h) + D_RETURN; + if (b->current.shaded != 0) + D_RETURN; if (b->mode.resize == 7) { b->current.requested.h -= dy; @@ -1264,14 +1348,14 @@ } e_border_adjust_limits(b); b->changed = 1; - { - char buf[1024]; - - e_border_print_size(buf, b); - e_guides_move(b->current.x, b->current.y); - e_guides_resize(b->current.w, b->current.h); - e_guides_display_text(buf); - } + { + char buf[1024]; + + e_border_print_size(buf, b); + e_guides_move(b->current.x, b->current.y); + e_guides_resize(b->current.w, b->current.h); + e_guides_display_text(buf); + } D_RETURN; UN(a); UN(data); @@ -1282,20 +1366,23 @@ UN(dx); } - -static void -e_act_close_start (E_Object *object, E_Action *a, void *data, int x, int y, int rx, int ry) +static void +e_act_close_start(E_Object * object, E_Action * a, void *data, int x, int y, + int rx, int ry) { - E_Border *b; - - D_ENTER; + E_Border *b; + D_ENTER; - b = (E_Border*) object; - if (!b) b = e_border_current_focused(); - if (!b) D_RETURN; - if (b->client.is_desktop) D_RETURN; - if (b->win.client) e_icccm_delete(b->win.client); + b = (E_Border *) object; + if (!b) + b = e_border_current_focused(); + if (!b) + D_RETURN; + if (b->client.is_desktop) + D_RETURN; + if (b->win.client) + e_icccm_delete(b->win.client); D_RETURN; UN(a); @@ -1306,19 +1393,23 @@ UN(ry); } - -static void -e_act_kill_start (E_Object *object, E_Action *a, void *data, int x, int y, int rx, int ry) +static void +e_act_kill_start(E_Object * object, E_Action * a, void *data, int x, int y, + int rx, int ry) { - E_Border *b; - + E_Border *b; + D_ENTER; - b = (E_Border*) object; - if (!b) b = e_border_current_focused(); - if (!b) D_RETURN; - if (b->client.is_desktop) D_RETURN; - if (b->win.client) ecore_window_kill_client(b->win.client); + b = (E_Border *) object; + if (!b) + b = e_border_current_focused(); + if (!b) + D_RETURN; + if (b->client.is_desktop) + D_RETURN; + if (b->win.client) + ecore_window_kill_client(b->win.client); D_RETURN; UN(a); @@ -1329,42 +1420,45 @@ UN(ry); } -static void e_act_cb_shade(int val, void *data); +static void e_act_cb_shade(int val, void *data); static void e_act_cb_shade(int val, void *data) { - E_Border *b; - static double t = 0.0; - double dif; - int si; - int pix_per_sec = 3200; - + E_Border *b; + static double t = 0.0; + double dif; + int si; + int pix_per_sec = 3200; + D_ENTER; b = data; - if (!b) b = e_border_current_focused(); - if (!b) D_RETURN; + if (!b) + b = e_border_current_focused(); + if (!b) + D_RETURN; if (b->client.is_desktop) - D_RETURN; + D_RETURN; - if (val == 0) + if (val == 0) { t = ecore_get_time(); ecore_window_gravity_set(b->win.client, SouthWestGravity); e_action_del_timer(E_OBJECT(b), "shader"); e_action_add_timer(E_OBJECT(b), "shader"); } - - dif = ecore_get_time() - t; - + + dif = ecore_get_time() - t; + si = (int)(dif * (double)pix_per_sec); - if (si > b->client.h) si = b->client.h; + if (si > b->client.h) + si = b->client.h; b->current.shaded = si; b->changed = 1; e_border_adjust_limits(b); e_border_apply_border(b); - if (si < b->client.h) - ecore_add_event_timer("shader", 0.01, e_act_cb_shade, 1, data); + if (si < b->client.h) + ecore_add_event_timer("shader", 0.01, e_act_cb_shade, 1, data); else { e_action_del_timer(E_OBJECT(b), "shader"); @@ -1374,41 +1468,45 @@ D_RETURN; } -static void e_act_cb_unshade(int val, void *data); +static void e_act_cb_unshade(int val, void *data); static void e_act_cb_unshade(int val, void *data) { - E_Border *b; - static double t = 0.0; - double dif; - int si; - int pix_per_sec = 3200; - + E_Border *b; + static double t = 0.0; + double dif; + int si; + int pix_per_sec = 3200; + D_ENTER; b = data; - if (!b) b = e_border_current_focused(); - if (!b) D_RETURN; - if (b->client.is_desktop) D_RETURN; - if (val == 0) + if (!b) + b = e_border_current_focused(); + if (!b) + D_RETURN; + if (b->client.is_desktop) + D_RETURN; + if (val == 0) { t = ecore_get_time(); ecore_window_gravity_set(b->win.client, SouthWestGravity); e_action_del_timer(E_OBJECT(b), "shader"); e_action_add_timer(E_OBJECT(b), "shader"); } - - dif = ecore_get_time() - t; - + + dif = ecore_get_time() - t; + si = b->client.h - (int)(dif * (double)pix_per_sec); - if (si < 0) si = 0; + if (si < 0) + si = 0; b->current.shaded = si; b->changed = 1; e_border_adjust_limits(b); e_border_apply_border(b); - if (si > 0) - ecore_add_event_timer("shader", 0.01, e_act_cb_unshade, 1, data); + if (si > 0) + ecore_add_event_timer("shader", 0.01, e_act_cb_unshade, 1, data); else { e_action_del_timer(E_OBJECT(b), "shader"); @@ -1418,24 +1516,27 @@ D_RETURN; } -static void -e_act_shade_start (E_Object *object, E_Action *a, void *data, int x, int y, int rx, int ry) +static void +e_act_shade_start(E_Object * object, E_Action * a, void *data, int x, int y, + int rx, int ry) { - E_Border *b; - + E_Border *b; + D_ENTER; - b = (E_Border*) object; - if (!b) b = e_border_current_focused(); - if (!b) D_RETURN; + b = (E_Border *) object; + if (!b) + b = e_border_current_focused(); + if (!b) + D_RETURN; if (b->client.is_desktop) - D_RETURN; + D_RETURN; if (b->current.shaded == 0) - e_act_cb_shade(0, b); + e_act_cb_shade(0, b); else - e_act_cb_unshade(0, b); + e_act_cb_unshade(0, b); D_RETURN; UN(a); @@ -1446,18 +1547,21 @@ UN(ry); } - -static void -e_act_raise_start (E_Object *object, E_Action *a, void *data, int x, int y, int rx, int ry) +static void +e_act_raise_start(E_Object * object, E_Action * a, void *data, int x, int y, + int rx, int ry) { - E_Border *b; - + E_Border *b; + D_ENTER; - b = (E_Border*) object; - if (!b) b = e_border_current_focused(); - if (!b) D_RETURN; - if (b->client.is_desktop) D_RETURN; + b = (E_Border *) object; + if (!b) + b = e_border_current_focused(); + if (!b) + D_RETURN; + if (b->client.is_desktop) + D_RETURN; e_border_raise(b); D_RETURN; @@ -1469,18 +1573,21 @@ UN(ry); } - -static void -e_act_lower_start (E_Object *object, E_Action *a, void *data, int x, int y, int rx, int ry) +static void +e_act_lower_start(E_Object * object, E_Action * a, void *data, int x, int y, + int rx, int ry) { - E_Border *b; - + E_Border *b; + D_ENTER; - b = (E_Border*) object; - if (!b) b = e_border_current_focused(); - if (!b) D_RETURN; - if (b->client.is_desktop) D_RETURN; + b = (E_Border *) object; + if (!b) + b = e_border_current_focused(); + if (!b) + D_RETURN; + if (b->client.is_desktop) + D_RETURN; e_border_lower(b); D_RETURN; @@ -1492,18 +1599,21 @@ UN(ry); } - -static void -e_act_raise_lower_start (E_Object *object, E_Action *a, void *data, int x, int y, int rx, int ry) +static void +e_act_raise_lower_start(E_Object * object, E_Action * a, void *data, int x, + int y, int rx, int ry) { - E_Border *b; - + E_Border *b; + D_ENTER; - b = (E_Border*) object; - if (!b) b = e_border_current_focused(); - if (!b) D_RETURN; - if (b->client.is_desktop) D_RETURN; + b = (E_Border *) object; + if (!b) + b = e_border_current_focused(); + if (!b) + D_RETURN; + if (b->client.is_desktop) + D_RETURN; D_RETURN; UN(a); @@ -1514,16 +1624,17 @@ UN(ry); } - -static void -e_act_exec_start (E_Object *object, E_Action *a, void *data, int x, int y, int rx, int ry) +static void +e_act_exec_start(E_Object * object, E_Action * a, void *data, int x, int y, + int rx, int ry) { - char *exe; - + char *exe; + D_ENTER; - exe = (char *) a->params; - if(!exe) D_RETURN; + exe = (char *)a->params; + if (!exe) + D_RETURN; e_exec_run(exe); D_RETURN; @@ -1536,19 +1647,23 @@ UN(object); } - -static void -e_act_menu_start (E_Object *object, E_Action *a, void *data, int x, int y, int rx, int ry) +static void +e_act_menu_start(E_Object * object, E_Action * a, void *data, int x, int y, + int rx, int ry) { - E_Border *b; - + E_Border *b; + D_ENTER; - if (e_block_is_active("menus")) D_RETURN; - b = (E_Border*) object; - if (!b) b = e_border_current_focused(); - if (!b) D_RETURN; - if (b->client.is_desktop) D_RETURN; + if (e_block_is_active("menus")) + D_RETURN; + b = (E_Border *) object; + if (!b) + b = e_border_current_focused(); + if (!b) + D_RETURN; + if (b->client.is_desktop) + D_RETURN; e_bordermenu_do(b); @@ -1561,14 +1676,14 @@ UN(ry); } - -static void -e_act_exit_start (E_Object *object, E_Action *a, void *data, int x, int y, int rx, int ry) +static void +e_act_exit_start(E_Object * object, E_Action * a, void *data, int x, int y, + int rx, int ry) { D_ENTER; e_view_machine_close_all_views(); - + ecore_focus_mode_reset(); ecore_sync(); @@ -1586,19 +1701,19 @@ UN(ry); } - -static void -e_act_restart_start (E_Object *object, E_Action *a, void *data, int x, int y, int rx, int ry) +static void +e_act_restart_start(E_Object * object, E_Action * a, void *data, int x, int y, + int rx, int ry) { D_ENTER; e_view_machine_close_all_views(); - + ecore_focus_mode_reset(); ecore_sync(); e_db_runtime_flush(); - + e_exec_restart(); D_RETURN; @@ -1611,20 +1726,25 @@ UN(ry); } - -static void -e_act_stick_start (E_Object *object, E_Action *a, void *data, int x, int y, int rx, int ry) +static void +e_act_stick_start(E_Object * object, E_Action * a, void *data, int x, int y, + int rx, int ry) { - E_Border *b; - + E_Border *b; + D_ENTER; - b = (E_Border*) object; - if (!b) b = e_border_current_focused(); - if (!b) D_RETURN; - if (b->client.is_desktop) D_RETURN; - if (b->client.sticky) b->client.sticky = 0; - else b->client.sticky = 1; + b = (E_Border *) object; + if (!b) + b = e_border_current_focused(); + if (!b) + D_RETURN; + if (b->client.is_desktop) + D_RETURN; + if (b->client.sticky) + b->client.sticky = 0; + else + b->client.sticky = 1; b->changed = 1; D_RETURN; @@ -1636,9 +1756,9 @@ UN(ry); } - -static void -e_act_sound_start (E_Object *object, E_Action *a, void *data, int x, int y, int rx, int ry) +static void +e_act_sound_start(E_Object * object, E_Action * a, void *data, int x, int y, + int rx, int ry) { D_ENTER; @@ -1652,23 +1772,26 @@ UN(ry); } - -static void -e_act_iconify_start (E_Object *object, E_Action *a, void *data, int x, int y, int rx, int ry) +static void +e_act_iconify_start(E_Object * object, E_Action * a, void *data, int x, int y, + int rx, int ry) { - E_Border *b; - + E_Border *b; + D_ENTER; #if 1 - b = (E_Border*) object; - if (!b) b = e_border_current_focused(); - if (!b) D_RETURN; - if (b->client.is_desktop) D_RETURN; + b = (E_Border *) object; + if (!b) + b = e_border_current_focused(); + if (!b) + D_RETURN; + if (b->client.is_desktop) + D_RETURN; D("iconify action start\n"); e_border_iconify(b); #endif - + D_RETURN; UN(object); UN(a); @@ -1679,20 +1802,25 @@ UN(ry); } - -static void -e_act_max_start (E_Object *object, E_Action *a, void *data, int x, int y, int rx, int ry) +static void +e_act_max_start(E_Object * object, E_Action * a, void *data, int x, int y, + int rx, int ry) { - E_Border *b; - + E_Border *b; + D_ENTER; - b = (E_Border*) object; - if (!b) b = e_border_current_focused(); - if (!b) D_RETURN; - if (b->client.is_desktop) D_RETURN; - if (b->current.shaded > 0) D_RETURN; - if ((b->mode.move) || (b->mode.resize)) D_RETURN; + b = (E_Border *) object; + if (!b) + b = e_border_current_focused(); + if (!b) + D_RETURN; + if (b->client.is_desktop) + D_RETURN; + if (b->current.shaded > 0) + D_RETURN; + if ((b->mode.move) || (b->mode.resize)) + D_RETURN; ... [truncated message content] |
From: <enl...@li...> - 2002-03-05 16:50:22
|
Enlightenment CVS committal Author : tillsan Project : e17 Module : apps/e Dir : e17/apps/e/src Modified Files: view.c Log Message: I assume Brian meant to do that. =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/view.c,v retrieving revision 1.138 retrieving revision 1.139 diff -u -3 -r1.138 -r1.139 --- view.c 5 Mar 2002 15:58:02 -0000 1.138 +++ view.c 5 Mar 2002 16:50:19 -0000 1.139 @@ -1810,10 +1810,12 @@ if (e_view_layout_get_element_geometry(v->layout, "Icons", &x, &y, &w, &h)) - v->spacing.window.l = x; - v->spacing.window.r = v->size.w - (x + w); - v->spacing.window.t = y; - v->spacing.window.b = v->size.h - (y + h); + { + v->spacing.window.l = x; + v->spacing.window.r = v->size.w - (x + w); + v->spacing.window.t = y; + v->spacing.window.b = v->size.h - (y + h); + } } v->scrollbar.v = e_scrollbar_new(v); |
From: <enl...@li...> - 2002-03-05 17:14:11
|
Enlightenment CVS committal Author : tillsan Project : e17 Module : apps/e Dir : e17/apps/e/src Modified Files: iconbar.c menubuild.c scrollbar.c scrollbar.h view.c view_layout.c Log Message: * remove a bunch of unused variables * scrollbars should not need to know the dir the view they are part of is in, because that can change without further notice. Access the dir through scrollbar->view->model->dir and replace the dir with the name of the view for named callbacks =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/iconbar.c,v retrieving revision 1.27 retrieving revision 1.28 diff -u -3 -r1.27 -r1.28 --- iconbar.c 4 Mar 2002 22:00:16 -0000 1.27 +++ iconbar.c 5 Mar 2002 17:14:10 -0000 1.28 @@ -382,7 +382,6 @@ e_iconbar_realize(E_Iconbar * ib) { Evas_List l; - double x, y, w, h; D_ENTER; D("realize iconbar\n"); @@ -521,7 +520,7 @@ &x, &y, &w, &h)) { D("Error: no geometry for iconbar, must not exist, clean it up.\n"); - e_object_unref(ib); + e_object_unref(E_OBJECT (ib)); D_RETURN; } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/menubuild.c,v retrieving revision 1.16 retrieving revision 1.17 diff -u -3 -r1.16 -r1.17 --- menubuild.c 3 Mar 2002 10:40:06 -0000 1.16 +++ menubuild.c 5 Mar 2002 17:14:10 -0000 1.17 @@ -610,7 +610,7 @@ e_build_menu_iconified_borders_build(E_Build_Menu * bm) { E_Menu *menu = NULL; - Evas_List l, entries = NULL; + Evas_List l; D_ENTER; =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/scrollbar.c,v retrieving revision 1.18 retrieving revision 1.19 diff -u -3 -r1.18 -r1.19 --- scrollbar.c 4 Mar 2002 22:00:16 -0000 1.18 +++ scrollbar.c 5 Mar 2002 17:14:10 -0000 1.19 @@ -81,7 +81,8 @@ if (sb->direction == 1) { /* load from the current dir's layout */ - snprintf(buf, PATH_MAX, "%s/.e_layout/scroll_base_v.bits.db", sb->dir); + snprintf(buf, PATH_MAX, "%s/.e_layout/scroll_base_v.bits.db", + sb->view->model->dir); sb->base = ebits_load(buf); /* if not loaded, load defaults */ @@ -93,7 +94,8 @@ } /* load from current dir's layout */ - snprintf(buf, PATH_MAX, "%s/.e_layout/scroll_bar_v.bits.db", sb->dir); + snprintf(buf, PATH_MAX, "%s/.e_layout/scroll_bar_v.bits.db", + sb->view->model->dir); sb->bar = ebits_load(buf); /* if not loaded, load defaults */ @@ -107,7 +109,8 @@ else { /* load from the current dir's layout */ - snprintf(buf, PATH_MAX, "%s/.e_layout/scroll_base_h.bits.db", sb->dir); + snprintf(buf, PATH_MAX, "%s/.e_layout/scroll_base_h.bits.db", + sb->view->model->dir); sb->base = ebits_load(buf); /* if not loaded, load defaults */ @@ -119,7 +122,8 @@ } /* load from current dir's layout */ - snprintf(buf, PATH_MAX, "%s/.e_layout/scroll_bar_h.bits.db", sb->dir); + snprintf(buf, PATH_MAX, "%s/.e_layout/scroll_bar_h.bits.db", + sb->view->model->dir); sb->bar = ebits_load(buf); /* if not loaded, load defaults */ @@ -203,7 +207,8 @@ sb->scroll_step = -16; sb->scroll_speed = 0.01; - snprintf(name, PATH_MAX, "scroll_up.%i.%s", sb->direction, sb->dir); + snprintf(name, PATH_MAX, "scroll_up.%i.%s", sb->direction, + sb->view->name); ecore_add_event_timer(name, sb->scroll_speed, e_sb_scroll_timer, 0, sb); } @@ -212,7 +217,8 @@ sb->scroll_step = 16; sb->scroll_speed = 0.01; - snprintf(name, PATH_MAX, "scroll_down.%i.%s", sb->direction, sb->dir); + snprintf(name, PATH_MAX, "scroll_down.%i.%s", sb->direction, + sb->view->name); ecore_add_event_timer(name, sb->scroll_speed, e_sb_scroll_timer, 0, sb); } @@ -235,12 +241,12 @@ { sb->scroll_step = -sb->scroll_step; snprintf(name, PATH_MAX, "scroll_up.%i.%s", sb->direction, - sb->dir); + sb->view->name); } else /* scroll down (or right) */ { snprintf(name, PATH_MAX, "scroll_down.%i.%s", sb->direction, - sb->dir); + sb->view->name); } /* scroll once in the chosen direction */ @@ -314,7 +320,8 @@ { sb->scroll_step = 0; - snprintf(name, PATH_MAX, "scroll_up.%i.%s", sb->direction, sb->dir); + snprintf(name, PATH_MAX, "scroll_up.%i.%s", sb->direction, + sb->view->name); ecore_del_event_timer(name); } @@ -322,7 +329,8 @@ { sb->scroll_step = 0; - snprintf(name, PATH_MAX, "scroll_down.%i.%s", sb->direction, sb->dir); + snprintf(name, PATH_MAX, "scroll_down.%i.%s", sb->direction, + sb->view->name); ecore_del_event_timer(name); } @@ -332,14 +340,14 @@ { sb->scroll_step = 0; snprintf(name, PATH_MAX, "scroll_up.%i.%s", sb->direction, - sb->dir); + sb->view->name); ecore_del_event_timer(name); } else if (sb->scroll_step > 0) { sb->scroll_step = 0; snprintf(name, PATH_MAX, "scroll_down.%i.%s", sb->direction, - sb->dir); + sb->view->name); ecore_del_event_timer(name); } } @@ -396,7 +404,7 @@ sb->mouse_down = 0; else D_RETURN; - + sb->view->changed = 1; D_RETURN; @@ -484,7 +492,8 @@ if (sb->val < 0) sb->val = 0; - snprintf(name, PATH_MAX, "scroll_up.%i.%s", sb->direction, sb->dir); + snprintf(name, PATH_MAX, "scroll_up.%i.%s", sb->direction, + sb->view->name); ecore_add_event_timer(name, sb->scroll_speed, e_sb_scroll_timer, 0, sb); } @@ -494,7 +503,8 @@ if ((sb->val + sb->range) > sb->max) sb->val = sb->max - sb->range; - snprintf(name, PATH_MAX, "scroll_down.%i.%s", sb->direction, sb->dir); + snprintf(name, PATH_MAX, "scroll_down.%i.%s", sb->direction, + sb->view->name); ecore_add_event_timer(name, sb->scroll_speed, e_sb_scroll_timer, 0, sb); } @@ -523,7 +533,6 @@ e_object_init(E_OBJECT(sb), (E_Cleanup_Func) e_scrollbar_cleanup); sb->view = v; - e_strdup(sb->dir, v->model->dir); sb->range = 1.0; sb->max = 1.0; @@ -547,11 +556,10 @@ if (sb->bar) ebits_free(sb->bar); } - IF_FREE(sb->dir); - snprintf(name, PATH_MAX, "scroll_up.%i.%s", sb->direction, sb->dir); + snprintf(name, PATH_MAX, "scroll_up.%i.%s", sb->direction, sb->view->name); ecore_del_event_timer(name); - snprintf(name, PATH_MAX, "scroll_down.%i.%s", sb->direction, sb->dir); + snprintf(name, PATH_MAX, "scroll_down.%i.%s", sb->direction, sb->view->name); ecore_del_event_timer(name); e_object_cleanup(E_OBJECT(sb)); =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/scrollbar.h,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- scrollbar.h 4 Mar 2002 22:00:16 -0000 1.8 +++ scrollbar.h 5 Mar 2002 17:14:10 -0000 1.9 @@ -25,7 +25,6 @@ double range; E_View *view; - char *dir; Evas evas; Ebits_Object bar; =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/view.c,v retrieving revision 1.139 retrieving revision 1.140 diff -u -3 -r1.139 -r1.140 --- view.c 5 Mar 2002 16:50:19 -0000 1.139 +++ view.c 5 Mar 2002 17:14:10 -0000 1.140 @@ -2166,7 +2166,6 @@ * Atom destination_atom; * } Ecore_Event_Dnd_Data_Request; */ - Evas_List l; E_View *v; Evas_List ll; char *data = NULL; =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/view_layout.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- view_layout.c 5 Mar 2002 15:45:18 -0000 1.1 +++ view_layout.c 5 Mar 2002 17:14:10 -0000 1.2 @@ -3,13 +3,12 @@ #include "util.h" static void e_view_layout_cleanup(E_View_Layout *layout); +static int e_view_layout_add_element(E_View_Layout *layout, char *name); E_View_Layout * e_view_layout_new(E_View *v) { E_View_Layout *layout; - Ebits_Object bits; - char buf[PATH_MAX]; D_ENTER; @@ -116,7 +115,7 @@ D_RETURN; } -int +static int e_view_layout_add_element(E_View_Layout *layout, char *name) { E_View_Layout_Element *el; |
From: <enl...@li...> - 2002-03-06 20:44:51
|
Enlightenment CVS committal Author : tillsan Project : e17 Module : apps/e Dir : e17/apps/e/src Modified Files: Makefile.am e_view_machine.c e_view_machine.h iconbar.c icons.c scrollbar.c view.c view.h view_layout.c Log Message: rename E_View_Model to E_Dir. That was a stupid name to begin with. :) =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/Makefile.am,v retrieving revision 1.48 retrieving revision 1.49 diff -u -3 -r1.48 -r1.49 --- Makefile.am 4 Mar 2002 22:00:15 -0000 1.48 +++ Makefile.am 6 Mar 2002 20:44:47 -0000 1.49 @@ -78,7 +78,7 @@ util.h util.c \ view.h view.c \ e_file.h e_file.c \ - e_view_model.h e_view_model.c \ + e_dir.h e_dir.c \ e_view_machine.h e_view_machine.c \ view_layout.h view_layout.c \ e.h =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/e_view_machine.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- e_view_machine.c 3 Mar 2002 10:40:06 -0000 1.8 +++ e_view_machine.c 6 Mar 2002 20:44:47 -0000 1.9 @@ -1,6 +1,6 @@ #include <Ecore.h> #include "e_view_machine.h" -#include "e_view_model.h" +#include "e_dir.h" #include "util.h" #include "globals.h" #include "file.h" @@ -12,29 +12,29 @@ if (VM == NULL) { - VM = NEW(E_View_Model, 1); + VM = NEW(E_Dir, 1); VM->views = NULL; - VM->models = NULL; + VM->dirs = NULL; e_view_init(); - e_view_model_init(); + e_dir_init(); } D_RETURN; } void -e_view_machine_register_view_model(E_View_Model * m) +e_view_machine_register_dir(E_Dir * d) { D_ENTER; - VM->models = evas_list_append(VM->models, m); + VM->dirs = evas_list_append(VM->dirs, d); D_RETURN; } void -e_view_machine_unregister_view_model(E_View_Model * m) +e_view_machine_unregister_dir(E_Dir * d) { D_ENTER; - VM->models = evas_list_remove(VM->models, m); + VM->dirs = evas_list_remove(VM->dirs, d); D_RETURN; } @@ -65,15 +65,15 @@ { E_View *v = l->data; - e_object_unref(E_OBJECT(v->model)); + e_object_unref(E_OBJECT(v->dir)); } D_RETURN; } -E_View_Model * -e_view_machine_model_lookup(char *path) +E_Dir * +e_view_machine_dir_lookup(char *path) { - E_View_Model *m; + E_Dir *d; Evas_List l; char *realpath = NULL; @@ -84,15 +84,15 @@ realpath = e_file_realpath(path); - for (l = VM->models; l; l = l->next) + for (l = VM->dirs; l; l = l->next) { - m = l->data; - if (!strcmp(m->dir, realpath)) + d = l->data; + if (!strcmp(d->dir, realpath)) { - D("Model for this dir already exists\n"); + D("E_Dir for this dir already exists\n"); IF_FREE(realpath); - D_RETURN_(m); + D_RETURN_(d); } } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/e_view_machine.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_view_machine.h 3 Mar 2002 10:40:06 -0000 1.6 +++ e_view_machine.h 6 Mar 2002 20:44:47 -0000 1.7 @@ -5,18 +5,18 @@ struct _e_view_machine { Evas_List views; - Evas_List models; + Evas_List dirs; }; typedef struct _e_view_machine E_View_Machine; void e_view_machine_init(void); void e_view_machine_register_view(E_View * v); void e_view_machine_unregister_view(E_View * v); -void e_view_machine_register_view_model(E_View_Model * m); -void e_view_machine_unregister_view_model(E_View_Model * m); +void e_view_machine_register_dir(E_Dir * d); +void e_view_machine_unregister_dir(E_Dir * d); void e_view_machine_close_all_views(void); -E_View_Model *e_view_machine_model_lookup(char *path); +E_Dir *e_view_machine_dir_lookup(char *path); E_View *e_view_machine_get_view_by_main_window(Window win); E_View *e_view_machine_get_view_by_base_window(Window win); =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/iconbar.c,v retrieving revision 1.28 retrieving revision 1.29 diff -u -3 -r1.28 -r1.29 --- iconbar.c 5 Mar 2002 17:14:10 -0000 1.28 +++ iconbar.c 6 Mar 2002 20:44:47 -0000 1.29 @@ -239,7 +239,7 @@ D("new iconbar\n"); /* first we want to load the iconbar data itself - ie the config info */ /* for what icons we have and what they execute */ - snprintf(buf, PATH_MAX, "%s/.e_layout/iconbar.db", v->model->dir); + snprintf(buf, PATH_MAX, "%s/.e_layout/iconbar.db", v->dir->dir); /* use the config system to simply load up the db and start making */ /* structs and lists and stuff for us... we told it how to in init */ ib = e_config_load(buf, "", cf_iconbar); @@ -289,7 +289,7 @@ /* now we need to load up a bits file that tells us where in the view the */ /* iconbar is meant to go. same place. just a slightly different name */ - snprintf(buf, PATH_MAX, "%s/.e_layout/iconbar.bits.db", v->model->dir); + snprintf(buf, PATH_MAX, "%s/.e_layout/iconbar.bits.db", v->dir->dir); ib->bit = ebits_load(buf); /* we didn't find one? */ @@ -400,7 +400,7 @@ /* a lump of image data inlined in the iconbar db - so the icons */ /* themselves follow the iconbar wherever it goes */ snprintf(buf, PATH_MAX, "%s/.e_layout/iconbar.db:%s", - ib->view->model->dir, ic->image_path); + ib->view->dir->dir, ic->image_path); /* add the icon image object */ ic->image = evas_add_image_from_file(ib->view->evas, buf); /* add an imlib image so we can save it later */ @@ -714,7 +714,7 @@ Evas_List l; int i; - snprintf(buf, PATH_MAX, "%s/.e_iconbar.db", ib->view->model->dir); + snprintf(buf, PATH_MAX, "%s/.e_iconbar.db", ib->view->dir->dir); D("%s\n", buf); if (ib->changed) @@ -745,7 +745,7 @@ snprintf(buf2, PATH_MAX, "%s/.e_iconbar.db:/icons/%i/image", - ib->view->model->dir, i); + ib->view->dir->dir, i); D("save image\n"); imlib_save_image(buf2); } @@ -882,7 +882,7 @@ /* figure out its path */ snprintf(buf, PATH_MAX, "%s/.e_iconbar.db:%s", - ic->iconbar->view->model->dir, ic->image_path); + ic->iconbar->view->dir->dir, ic->image_path); /* add it */ ic->hi.image = evas_add_image_from_file(ic->iconbar->view->evas, buf); @@ -1562,7 +1562,7 @@ D_ENTER; #if 0 - D("add files: %s\n", source->model->dir); + D("add files: %s\n", source->dir->dir); for (i = 0; i < num_files; i++) { char *file = e_file_get_file(strdup(dnd_files[i])); @@ -1594,7 +1594,7 @@ { D("over icon: %s\n", ibic->exec); snprintf(buf, PATH_MAX, "%s/%s:/icon/normal", - ic->view->model->dir, ic->file); + ic->view->dir->dir, ic->file); D("set icon: %s\n", buf); ibic->imlib_image = imlib_load_image(buf); @@ -1637,7 +1637,7 @@ D("EEEEEEEEEEEEK: how the hell did this happen?"); D("x: %f, v-dir: %s, ib-dir: %s\n", ibic->iconbar->icon_area.x, - v->model->dir, ibic->iconbar->view->model->dir); + v->dir->dir, ibic->iconbar->view->dir->dir); if (!ic->info.icon) D_RETURN; @@ -1645,7 +1645,7 @@ ibic->image = evas_add_image_from_file(v->evas, buf); ibic->imlib_image = imlib_load_image(buf); ibic->image_path = strdup(ic->info.icon); - snprintf(buf, PATH_MAX, "%s/%s", ic->view->model->dir, ic->file); + snprintf(buf, PATH_MAX, "%s/%s", ic->view->dir->dir, ic->file); ibic->exec = strdup(buf); evas_set_clip(v->evas, ibic->image, v->iconbar->clip); =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/icons.c,v retrieving revision 1.38 retrieving revision 1.39 diff -u -3 -r1.38 -r1.39 --- icons.c 3 Mar 2002 10:40:06 -0000 1.38 +++ icons.c 6 Mar 2002 20:44:48 -0000 1.39 @@ -4,7 +4,7 @@ #include "cursors.h" #include "file.h" #include "util.h" -#include "e_view_model.h" +#include "e_dir.h" #include "e_file.h" #include "e_view_machine.h" #include "globals.h" @@ -925,7 +925,7 @@ v->size.w = 400; v->size.h = 300; v->options.back_pixmap = 0; - snprintf(buf, PATH_MAX, "%s/%s", ic->view->model->dir, ic->file->file); + snprintf(buf, PATH_MAX, "%s/%s", ic->view->dir->dir, ic->file->file); D("new dir >%s<\n", buf); e_view_set_dir(v, buf, 0); e_view_realize(v); =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/scrollbar.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -3 -r1.19 -r1.20 --- scrollbar.c 5 Mar 2002 17:14:10 -0000 1.19 +++ scrollbar.c 6 Mar 2002 20:44:48 -0000 1.20 @@ -82,7 +82,7 @@ { /* load from the current dir's layout */ snprintf(buf, PATH_MAX, "%s/.e_layout/scroll_base_v.bits.db", - sb->view->model->dir); + sb->view->dir->dir); sb->base = ebits_load(buf); /* if not loaded, load defaults */ @@ -95,7 +95,7 @@ /* load from current dir's layout */ snprintf(buf, PATH_MAX, "%s/.e_layout/scroll_bar_v.bits.db", - sb->view->model->dir); + sb->view->dir->dir); sb->bar = ebits_load(buf); /* if not loaded, load defaults */ @@ -110,7 +110,7 @@ { /* load from the current dir's layout */ snprintf(buf, PATH_MAX, "%s/.e_layout/scroll_base_h.bits.db", - sb->view->model->dir); + sb->view->dir->dir); sb->base = ebits_load(buf); /* if not loaded, load defaults */ @@ -123,7 +123,7 @@ /* load from current dir's layout */ snprintf(buf, PATH_MAX, "%s/.e_layout/scroll_bar_h.bits.db", - sb->view->model->dir); + sb->view->dir->dir); sb->bar = ebits_load(buf); /* if not loaded, load defaults */ =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/view.c,v retrieving revision 1.140 retrieving revision 1.141 diff -u -3 -r1.140 -r1.141 --- view.c 5 Mar 2002 17:14:10 -0000 1.140 +++ view.c 6 Mar 2002 20:44:48 -0000 1.141 @@ -11,7 +11,7 @@ #include "file.h" #include "util.h" #include "icons.h" -#include "e_view_model.h" +#include "e_dir.h" #include "e_view_machine.h" #include "e_file.h" #include "globals.h" @@ -86,7 +86,7 @@ ic->q.write_xy = 0; /* FIXME */ - snprintf(buf, PATH_MAX, "%s/%s", ic->view->model->dir, + snprintf(buf, PATH_MAX, "%s/%s", ic->view->dir->dir, ic->file->file); D("write meta xy for icon for file %s\n", ic->file->file); @@ -99,7 +99,7 @@ { char name[PATH_MAX]; - snprintf(name, PATH_MAX, "icon_xy_record.%s", v->model->dir); + snprintf(name, PATH_MAX, "icon_xy_record.%s", v->dir->dir); ecore_add_event_timer(name, 0.01, e_view_write_icon_xy_timeout, 0, v); D_RETURN; @@ -852,13 +852,13 @@ D("Record geom for view\n"); ecore_window_get_frame_size(v->win.base, &left, NULL, &top, NULL); efsd_set_metadata_int(e_fs_get_connection(), - "/view/x", v->model->dir, v->location.x - left); + "/view/x", v->dir->dir, v->location.x - left); efsd_set_metadata_int(e_fs_get_connection(), - "/view/y", v->model->dir, v->location.y - top); + "/view/y", v->dir->dir, v->location.y - top); efsd_set_metadata_int(e_fs_get_connection(), - "/view/w", v->model->dir, v->size.w); + "/view/w", v->dir->dir, v->size.w); efsd_set_metadata_int(e_fs_get_connection(), - "/view/h", v->model->dir, v->size.h); + "/view/h", v->dir->dir, v->size.h); } D_RETURN; @@ -885,7 +885,7 @@ D_ENTER; - snprintf(name, PATH_MAX, "geometry_record.%s", v->model->dir); + snprintf(name, PATH_MAX, "geometry_record.%s", v->dir->dir); ecore_add_event_timer(name, 0.10, e_view_geometry_record_timeout, 0, v); D_RETURN; @@ -898,7 +898,7 @@ D_ENTER; - snprintf(name, PATH_MAX, "icon_xy_record.%s", v->model->dir); + snprintf(name, PATH_MAX, "icon_xy_record.%s", v->dir->dir); ecore_add_event_timer(name, 0.10, e_view_write_icon_xy_timeout, 0, v); D_RETURN; @@ -1352,7 +1352,7 @@ { if ((v = e_view_machine_get_view_by_main_window(e->win))) { - if (v->model->is_desktop) + if (v->dir->is_desktop) { evas_event_enter(v->evas); } @@ -1611,8 +1611,8 @@ snprintf(name, PATH_MAX, "resort_timer.%s", v->name); ecore_del_event_timer(name); - /* unregister with the underlying model and the global list of views */ - e_view_model_unregister_view(v); + /* unregister with the underlying dir and the global list of views */ + e_dir_unregister_view(v); e_view_machine_unregister_view(v); /* FIXME: clean up the rest!!! this leaks ... */ @@ -1682,7 +1682,7 @@ void e_view_set_dir(E_View * v, char *path, int is_desktop) { - E_View_Model *m = NULL; + E_Dir *d = NULL; char buf[PATH_MAX]; D_ENTER; @@ -1690,14 +1690,14 @@ if (!v || !path || *path == 0) D_RETURN; - if (!(m = e_view_machine_model_lookup(path))) + if (!(d = e_view_machine_dir_lookup(path))) { D("Model for this dir doesn't exist, make a new one\n"); - m = e_view_model_new(); - e_view_model_set_dir(m, path); + d = e_dir_new(); + e_dir_set_dir(d, path); - snprintf(buf, PATH_MAX, "%s/.e_background.bg.db", m->dir); + snprintf(buf, PATH_MAX, "%s/.e_background.bg.db", d->dir); if (!e_file_exists(buf)) { if (is_desktop) @@ -1711,32 +1711,32 @@ e_config_get("backgrounds")); } } - e_strdup(m->bg_file, buf); - m->is_desktop = is_desktop; + e_strdup(d->bg_file, buf); + d->is_desktop = is_desktop; } - if (m) + if (d) { - e_view_model_register_view(m, v); + e_dir_register_view(d, v); /* FIXME do a real naming scheme here */ - snprintf(buf, PATH_MAX, "%s:%d", v->model->dir, - e_object_get_usecount(E_OBJECT(v->model))); + snprintf(buf, PATH_MAX, "%s:%d", v->dir->dir, + e_object_get_usecount(E_OBJECT(v->dir))); e_strdup(v->name, buf); D("assigned name to view: %s\n", v->name); /* Request metadata via efsd */ v->geom_get.x = efsd_get_metadata(e_fs_get_connection(), - "/view/x", v->model->dir, EFSD_INT); + "/view/x", v->dir->dir, EFSD_INT); v->geom_get.y = efsd_get_metadata(e_fs_get_connection(), - "/view/y", v->model->dir, EFSD_INT); + "/view/y", v->dir->dir, EFSD_INT); v->geom_get.w = efsd_get_metadata(e_fs_get_connection(), - "/view/w", v->model->dir, EFSD_INT); + "/view/w", v->dir->dir, EFSD_INT); v->geom_get.h = efsd_get_metadata(e_fs_get_connection(), - "/view/h", v->model->dir, EFSD_INT); + "/view/h", v->dir->dir, EFSD_INT); /* FIXME currently, we dont use this anyway */ /* * * v->getbg = efsd_get_metadata(e_fs_get_connection(), - * * "/view/background", v->model->dir, EFSD_STRING); + * * "/view/background", v->dir->dir, EFSD_STRING); */ v->geom_get.busy = 1; } @@ -1881,7 +1881,7 @@ /* populate with icons for all files in the dir we are monitoring. * This has to be called _after_ view_realize because * view_add_file needs the evas to be intialized */ - for (l = v->model->files; l; l = l->next) + for (l = v->dir->files; l; l = l->next) { E_File *f = (E_File *) l->data; E_Icon *ic; @@ -2066,7 +2066,7 @@ E_Background bg; /* This should only be called if the background did really - * change in the underlying model. We dont check again + * change in the underlying dir. We dont check again * here. */ D_ENTER; @@ -2085,7 +2085,7 @@ e_db_flush(); } - bg = e_bg_load(v->model->bg_file); + bg = e_bg_load(v->dir->bg_file); if (bg) { @@ -2213,13 +2213,13 @@ if (first) { /*FIXME */ - snprintf(buf, PATH_MAX, "file:%s/%s", v->model->dir, + snprintf(buf, PATH_MAX, "file:%s/%s", v->dir->dir, ic->file->file); first = 0; } else /* FIXME */ - snprintf(buf, PATH_MAX, "\r\nfile:%s/%s", v->model->dir, + snprintf(buf, PATH_MAX, "\r\nfile:%s/%s", v->dir->dir, ic->file->file); REALLOC(data, char, strlen(data) + strlen(buf) + 1); @@ -2246,13 +2246,13 @@ if (first) { /*FIXME */ - snprintf(buf, PATH_MAX, "%s/%s\n", v->model->dir, + snprintf(buf, PATH_MAX, "%s/%s\n", v->dir->dir, ic->file->file); first = 0; } else /*FIXME */ - snprintf(buf, PATH_MAX, "\n%s/%s", v->model->dir, + snprintf(buf, PATH_MAX, "\n%s/%s", v->dir->dir, ic->file->file); REALLOC(data, char, strlen(data) + strlen(buf) + 1); @@ -2278,7 +2278,7 @@ char buf[16384]; /* FIXME */ - snprintf(buf, PATH_MAX, "file:%s/%s", v->model->dir, + snprintf(buf, PATH_MAX, "file:%s/%s", v->dir->dir, ic->file->file); data = strdup(buf); break; @@ -2411,7 +2411,7 @@ { /* Dropped! Handle data */ /* Same view or same underlying dir? Mark to skip action */ - if (e->win == e->source_win || v->model == v_dnd_source->model) + if (e->win == e->source_win || v->dir == v_dnd_source->dir) v_dnd_source->drag.matching_drop_attempt = 1; /* Perform the action... */ e_dnd_handle_drop(v); @@ -2529,7 +2529,7 @@ if (dnd_files[out]) FREE(dnd_files[out]); - dnd_files[out++] = strdup(v->model->dir); + dnd_files[out++] = strdup(v->dir->dir); switch (dnd_pending_mode) { =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/view.h,v retrieving revision 1.41 retrieving revision 1.42 diff -u -3 -r1.41 -r1.42 --- view.h 4 Mar 2002 23:57:56 -0000 1.41 +++ view.h 6 Mar 2002 20:44:48 -0000 1.42 @@ -7,7 +7,7 @@ #include "fs.h" #include "iconbar.h" #include "object.h" -#include "e_view_model.h" +#include "e_dir.h" #include "e_file.h" #include "view_layout.h" @@ -28,7 +28,7 @@ #ifndef E_VIEW_MODEL_TYPEDEF #define E_VIEW_MODEL_TYPEDEF -typedef struct _E_View_Model E_View_Model; +typedef struct _E_Dir E_Dir; #endif #ifndef E_VIEW_LAYOUT_TYPEDEF @@ -61,7 +61,7 @@ char *name; - E_View_Model *model; + E_Dir *dir; struct { @@ -273,7 +273,7 @@ * @is_desktop Inidicates wether the view is a desktop * * This function sets a view to a directory, loading the - * view's metadata (view window coordinates etc). If a view_model already + * view's metadata (view window coordinates etc). If a dir already * exists for this dir, it is reused, otherwise a new on is created. */ void e_view_set_dir(E_View * v, char *dir, int is_desktop); @@ -282,7 +282,7 @@ * e_view_populate - Draws icons for all files in view * @v The view to populate * - * Goes through the list of files in the underlying view_model and calls + * Goes through the list of files in the underlying dir and calls * view_add_file for each one. This results in icons being created for each * file. */ =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/view_layout.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- view_layout.c 5 Mar 2002 17:14:10 -0000 1.2 +++ view_layout.c 6 Mar 2002 20:44:48 -0000 1.3 @@ -65,7 +65,7 @@ /* check for custom layout bits */ snprintf(buf, PATH_MAX, "%s/.e_layout/layout.bits.db", - layout->view->model->dir); + layout->view->dir->dir); /* keep track of file loaded */ IF_FREE(layout->file); e_strdup(layout->file, buf); @@ -74,7 +74,7 @@ /* if custom doesn't exist, load default layout */ if (!bits) { - if (layout->view->model->is_desktop) + if (layout->view->dir->is_desktop) snprintf(buf, PATH_MAX, "%s/desktop.bits.db", e_config_get("layout")); else snprintf(buf, PATH_MAX, "%s/view.bits.db", e_config_get("layout")); |
From: <enl...@li...> - 2002-03-06 20:59:21
|
Enlightenment CVS committal Author : tillsan Project : e17 Module : apps/e Dir : e17/apps/e/src Modified Files: view.c view.h Added Files: e_dir.c e_dir.h Log Message: add the files, too =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/view.c,v retrieving revision 1.141 retrieving revision 1.142 diff -u -3 -r1.141 -r1.142 --- view.c 6 Mar 2002 20:44:48 -0000 1.141 +++ view.c 6 Mar 2002 20:59:16 -0000 1.142 @@ -554,19 +554,19 @@ } void -e_view_deselect_all(E_View *v) +e_view_deselect_all(E_View * v) { Evas_List l; D_ENTER; - for (l = v->icons; l; l = l->next) - { - E_Icon *ic; + for (l = v->icons; l; l = l->next) + { + E_Icon *ic; - ic = l->data; - e_icon_deselect(ic); - } + ic = l->data; + e_icon_deselect(ic); + } D_RETURN; } @@ -584,7 +584,7 @@ ic = l->data; if (ic != not_ic) - e_icon_deselect(ic); + e_icon_deselect(ic); } D_RETURN; @@ -908,7 +908,7 @@ e_configure(Ecore_Event * ev) { Ecore_Event_Window_Configure *e; - E_View *v; + E_View *v; D_ENTER; @@ -972,17 +972,17 @@ if (e_view_layout_get_element_geometry(v->layout, "Scrollbar_H", &x, &y, &w, &h)) - { - e_scrollbar_move(v->scrollbar.h, x, y); - e_scrollbar_resize(v->scrollbar.h, w, h); - } + { + e_scrollbar_move(v->scrollbar.h, x, y); + e_scrollbar_resize(v->scrollbar.h, w, h); + } if (e_view_layout_get_element_geometry(v->layout, "Scrollbar_V", &x, &y, &w, &h)) - { - e_scrollbar_move(v->scrollbar.v, x, y); - e_scrollbar_resize(v->scrollbar.v, w, h); - } + { + e_scrollbar_move(v->scrollbar.v, x, y); + e_scrollbar_resize(v->scrollbar.v, w, h); + } } e_scrollbar_move(v->scrollbar.v, @@ -1005,16 +1005,16 @@ e_property(Ecore_Event * ev) { Ecore_Event_Window_Configure *e; - E_View *v; + E_View *v; D_ENTER; e = ev->event; if (e && e->win) { - if ((v = e_view_machine_get_view_by_base_window(e->win))) - { - } + if ((v = e_view_machine_get_view_by_base_window(e->win))) + { + } } D_RETURN; @@ -1024,15 +1024,15 @@ e_unmap(Ecore_Event * ev) { Ecore_Event_Window_Unmap *e; - E_View *v; + E_View *v; D_ENTER; e = ev->event; if (e && e->win) { - if ((v = e_view_machine_get_view_by_base_window(e->win))) - { + if ((v = e_view_machine_get_view_by_base_window(e->win))) + { } } @@ -1043,14 +1043,14 @@ e_visibility(Ecore_Event * ev) { Ecore_Event_Window_Unmap *e; - E_View *v; + E_View *v; D_ENTER; e = ev->event; if (e && e->win) { - if ((v = e_view_machine_get_view_by_base_window(e->win))) + if ((v = e_view_machine_get_view_by_base_window(e->win))) { } } @@ -1062,14 +1062,14 @@ e_focus_in(Ecore_Event * ev) { Ecore_Event_Window_Focus_In *e; - E_View *v; + E_View *v; D_ENTER; e = ev->event; if (e && e->win) { - if ((v = e_view_machine_get_view_by_base_window(e->win))) + if ((v = e_view_machine_get_view_by_base_window(e->win))) { } } @@ -1081,14 +1081,14 @@ e_focus_out(Ecore_Event * ev) { Ecore_Event_Window_Focus_Out *e; - E_View *v; + E_View *v; D_ENTER; e = ev->event; if (e && e->win) { - if ((v = e_view_machine_get_view_by_base_window(e->win))) + if ((v = e_view_machine_get_view_by_base_window(e->win))) { } } @@ -1100,14 +1100,14 @@ e_delete(Ecore_Event * ev) { Ecore_Event_Window_Delete *e; - E_View *v; + E_View *v; D_ENTER; e = ev->event; if (e && e->win) { - if ((v = e_view_machine_get_view_by_base_window(e->win))) + if ((v = e_view_machine_get_view_by_base_window(e->win))) { e_object_unref(E_OBJECT(v)); D_RETURN; @@ -1136,14 +1136,14 @@ * int ok; * } Ecore_Event_Dnd_Drop_Status; */ - E_View *v; + E_View *v; D_ENTER; e = ev->event; if (e && e->win) { - if ((v = e_view_machine_get_view_by_base_window(e->win))) + if ((v = e_view_machine_get_view_by_base_window(e->win))) { if (dnd_pending_mode != E_DND_DELETED && dnd_pending_mode != E_DND_COPIED) @@ -1172,14 +1172,14 @@ e_wheel(Ecore_Event * ev) { Ecore_Event_Wheel *e; - E_View *v; + E_View *v; D_ENTER; e = ev->event; if (e && e->win) { - if ((v = e_view_machine_get_view_by_main_window(e->win))) + if ((v = e_view_machine_get_view_by_main_window(e->win))) { } } @@ -1191,15 +1191,15 @@ e_key_down(Ecore_Event * ev) { Ecore_Event_Key_Down *e; - E_View *v; + E_View *v; D_ENTER; e = ev->event; if (e && e->win) { - if ((v = e_view_machine_get_view_by_main_window(e->win)) - || (v = e_view_machine_get_view_by_base_window(e->win))) + if ((v = e_view_machine_get_view_by_main_window(e->win)) + || (v = e_view_machine_get_view_by_base_window(e->win))) { if (!strcmp(e->key, "Up")) { @@ -1244,14 +1244,14 @@ e_key_up(Ecore_Event * ev) { Ecore_Event_Key_Up *e; - E_View *v; + E_View *v; D_ENTER; e = ev->event; if (e && e->win) { - if ((v = e_view_machine_get_view_by_base_window(e->win))) + if ((v = e_view_machine_get_view_by_base_window(e->win))) { } } @@ -1263,7 +1263,7 @@ e_mouse_down(Ecore_Event * ev) { Ecore_Event_Mouse_Down *e; - E_View *v; + E_View *v; D_ENTER; @@ -1271,7 +1271,7 @@ current_ev = ev; if (e && e->win) { - if ((v = e_view_machine_get_view_by_main_window(e->win))) + if ((v = e_view_machine_get_view_by_main_window(e->win))) { int focus_mode; @@ -1294,7 +1294,7 @@ e_mouse_up(Ecore_Event * ev) { Ecore_Event_Mouse_Up *e; - E_View *v; + E_View *v; D_ENTER; @@ -1302,7 +1302,7 @@ current_ev = ev; if (e && e->win) { - if ((v = e_view_machine_get_view_by_main_window(e->win))) + if ((v = e_view_machine_get_view_by_main_window(e->win))) { evas_event_button_up(v->evas, e->x, e->y, e->button); current_ev = NULL; @@ -1318,7 +1318,7 @@ e_mouse_move(Ecore_Event * ev) { Ecore_Event_Mouse_Move *e; - E_View *v; + E_View *v; D_ENTER; @@ -1326,7 +1326,7 @@ current_ev = ev; if (e && e->win) { - if ((v = e_view_machine_get_view_by_main_window(e->win))) + if ((v = e_view_machine_get_view_by_main_window(e->win))) { evas_event_move(v->evas, e->x, e->y); current_ev = NULL; @@ -1342,7 +1342,7 @@ e_mouse_in(Ecore_Event * ev) { Ecore_Event_Window_Enter *e; - E_View *v; + E_View *v; D_ENTER; @@ -1350,9 +1350,9 @@ current_ev = ev; if (e && e->win) { - if ((v = e_view_machine_get_view_by_main_window(e->win))) + if ((v = e_view_machine_get_view_by_main_window(e->win))) { - if (v->dir->is_desktop) + if (v->is_desktop) { evas_event_enter(v->evas); } @@ -1369,7 +1369,7 @@ e_mouse_out(Ecore_Event * ev) { Ecore_Event_Window_Leave *e; - E_View *v; + E_View *v; D_ENTER; @@ -1377,7 +1377,7 @@ current_ev = ev; if (e && e->win) { - if ((v = e_view_machine_get_view_by_main_window(e->win))) + if ((v = e_view_machine_get_view_by_main_window(e->win))) { evas_event_leave(v->evas); current_ev = NULL; @@ -1393,7 +1393,7 @@ e_window_expose(Ecore_Event * ev) { Ecore_Event_Window_Expose *e; - E_View *v; + E_View *v; D_ENTER; @@ -1401,7 +1401,7 @@ current_ev = ev; if (e && e->win) { - if ((v = e_view_machine_get_view_by_main_window(e->win))) + if ((v = e_view_machine_get_view_by_main_window(e->win))) { if (!(v->pmap)) evas_update_rect(v->evas, e->x, e->y, e->w, e->h); @@ -1590,14 +1590,13 @@ * not via a timeout, because we will destroy the object after this.*/ e_view_geometry_record(v); - if (v->iconbar) { /*e_iconbar_save_out_final(v->iconbar); */ e_object_unref(E_OBJECT(v->iconbar)); } if (v->bg) - e_bg_free(v->bg); + e_bg_free(v->bg); if (v->scrollbar.h) e_object_unref(E_OBJECT(v->scrollbar.h)); if (v->scrollbar.v) @@ -1605,7 +1604,6 @@ if (v->layout) e_object_unref(E_OBJECT(v->layout)); - ecore_window_destroy(v->win.base); snprintf(name, PATH_MAX, "resort_timer.%s", v->name); @@ -1717,7 +1715,7 @@ if (d) { - e_dir_register_view(d, v); + e_dir_register_view(d, v); /* FIXME do a real naming scheme here */ snprintf(buf, PATH_MAX, "%s:%d", v->dir->dir, e_object_get_usecount(E_OBJECT(v->dir))); @@ -1810,12 +1808,12 @@ if (e_view_layout_get_element_geometry(v->layout, "Icons", &x, &y, &w, &h)) - { - v->spacing.window.l = x; - v->spacing.window.r = v->size.w - (x + w); - v->spacing.window.t = y; - v->spacing.window.b = v->size.h - (y + h); - } + { + v->spacing.window.l = x; + v->spacing.window.r = v->size.w - (x + w); + v->spacing.window.t = y; + v->spacing.window.b = v->size.h - (y + h); + } } v->scrollbar.v = e_scrollbar_new(v); @@ -1841,17 +1839,17 @@ if (e_view_layout_get_element_geometry(v->layout, "Scrollbar_H", &x, &y, &w, &h)) - { - e_scrollbar_move(v->scrollbar.h, x, y); - e_scrollbar_resize(v->scrollbar.h, w, h); - } + { + e_scrollbar_move(v->scrollbar.h, x, y); + e_scrollbar_resize(v->scrollbar.h, w, h); + } if (e_view_layout_get_element_geometry(v->layout, "Scrollbar_V", &x, &y, &w, &h)) - { - e_scrollbar_move(v->scrollbar.v, x, y); - e_scrollbar_resize(v->scrollbar.v, w, h); - } + { + e_scrollbar_move(v->scrollbar.v, x, y); + e_scrollbar_resize(v->scrollbar.v, w, h); + } } /* I support dnd */ @@ -2195,7 +2193,7 @@ */ e = ev->event; if (!(v = e_view_machine_get_view_by_base_window(e->win))) - D_RETURN; + D_RETURN; if (e->uri_list) { @@ -2306,14 +2304,14 @@ * * Window win, root, source_win; * * } Ecore_Event_Dnd_Drop_End; */ - E_View *v; + E_View *v; D_ENTER; e = ev->event; if (e && e->win) { - if ((v = e_view_machine_get_view_by_base_window(e->win))) + if ((v = e_view_machine_get_view_by_base_window(e->win))) { if (v_dnd_source) { @@ -2350,14 +2348,14 @@ * int x, y; * } Ecore_Event_Dnd_Drop_Position; */ - E_View *v; + E_View *v; D_ENTER; e = ev->event; if (e && e->win) { - if ((v = e_view_machine_get_view_by_base_window(e->win))) + if ((v = e_view_machine_get_view_by_base_window(e->win))) { if (v->iconbar) { @@ -2400,14 +2398,14 @@ * Window win, root, source_win; * } Ecore_Event_Dnd_Drop; */ - E_View *v; + E_View *v; D_ENTER; e = ev->event; if (e && e->win) { - if ((v = e_view_machine_get_view_by_base_window(e->win))) + if ((v = e_view_machine_get_view_by_base_window(e->win))) { /* Dropped! Handle data */ /* Same view or same underlying dir? Mark to skip action */ @@ -2438,14 +2436,14 @@ * int copy, link, move; * } Ecore_Event_Dnd_Drop_Request; */ - E_View *v; + E_View *v; D_ENTER; e = ev->event; if (e && e->win) { - if ((v = e_view_machine_get_view_by_base_window(e->win))) + if ((v = e_view_machine_get_view_by_base_window(e->win))) { /* if it exists, we already have the data... */ if ((!dnd_files) && (e->num_files > 0)) @@ -2462,7 +2460,7 @@ /* if the dnd source is e itself then dont use the event mode */ if ((v == - e_view_machine_get_view_by_base_window(e->source_win))) + e_view_machine_get_view_by_base_window(e->source_win))) { dnd_pending_mode = v->drag.drop_mode; } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/view.h,v retrieving revision 1.42 retrieving revision 1.43 diff -u -3 -r1.42 -r1.43 --- view.h 6 Mar 2002 20:44:48 -0000 1.42 +++ view.h 6 Mar 2002 20:59:16 -0000 1.43 @@ -212,6 +212,8 @@ scrollbar; int is_listing; + + int is_desktop; E_Iconbar *iconbar; |
From: <enl...@li...> - 2002-03-06 21:02:09
|
Enlightenment CVS committal Author : tillsan Project : e17 Module : apps/e Dir : e17/apps/e/src Modified Files: view.c Log Message: oops, dont do that yet =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/view.c,v retrieving revision 1.142 retrieving revision 1.143 diff -u -3 -r1.142 -r1.143 --- view.c 6 Mar 2002 20:59:16 -0000 1.142 +++ view.c 6 Mar 2002 21:02:06 -0000 1.143 @@ -1352,7 +1352,7 @@ { if ((v = e_view_machine_get_view_by_main_window(e->win))) { - if (v->is_desktop) + if (v->dir->is_desktop) { evas_event_enter(v->evas); } |
From: <enl...@li...> - 2002-03-06 21:18:10
|
Enlightenment CVS committal Author : tillsan Project : e17 Module : apps/e Dir : e17/apps/e/src Removed Files: e_view_model.c e_view_model.h Log Message: remove those, we dont need them anymore |