From: <enl...@li...> - 2005-01-04 01:09:30
|
Enlightenment CVS committal Author : handyande Project : e17 Module : apps/e Dir : e17/apps/e/data/icons/images Added Files: .cvsignore Log Message: shh |
From: <enl...@li...> - 2005-01-04 01:09:30
|
Enlightenment CVS committal Author : handyande Project : e17 Module : apps/e Dir : e17/apps/e/data/icons Added Files: .cvsignore Log Message: shh |
From: <enl...@li...> - 2005-01-05 16:27:03
|
Enlightenment CVS committal Author : handyande Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_apps.c Log Message: Fix small seg =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_apps.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- e_apps.c 23 Dec 2004 06:38:27 -0000 1.10 +++ e_apps.c 5 Jan 2005 16:05:49 -0000 1.11 @@ -286,6 +286,9 @@ { E_App *a; + if (!name && !class) + return NULL; + a = l->data; if ((a->win_name) || (a->win_class)) { @@ -293,10 +296,10 @@ // printf("%s.%s == %s.%s\n", name, class, a->win_name, a->win_class); if ((!a->win_name) || - ((a->win_name) && (!strcmp(a->win_name, name)))) + ((a->win_name) && name && (!strcmp(a->win_name, name)))) ok++; if ((!a->win_class) || - ((a->win_class) && (!strcmp(a->win_class, class)))) + ((a->win_class) && class && (!strcmp(a->win_class, class)))) ok++; if (ok >= 2) { |
From: <enl...@li...> - 2005-01-06 18:41:30
|
Enlightenment CVS committal Author : handyande Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_zone.c Log Message: type =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_zone.c,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_zone.c 5 Jan 2005 10:37:53 -0000 1.5 +++ e_zone.c 6 Jan 2005 18:41:24 -0000 1.6 @@ -205,7 +205,7 @@ E_Menu *m; m = e_int_menus_clients_new(); - /* FIXME: this is a bit of a hack... setting m->zone - bad hack */ + /* FIXME: this is a bit of a hack... setting m->con - bad hack */ m->con = zone->container; e_menu_activate_mouse(m, zone->container, ev->output.x, ev->output.y, 1, 1, E_MENU_POP_DIRECTION_DOWN); |
From: <enl...@li...> - 2005-01-06 23:11:40
|
Enlightenment CVS committal Author : handyande Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: configure.in Log Message: Added libe check E.h for its functionality, currently you can make a nice front end for loading/enabling libs or setting the background Need to add Ecore_Event or similar for callbacks fo things like module_list or background_get etc See what you think =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/configure.in,v retrieving revision 1.40 retrieving revision 1.41 diff -u -3 -r1.40 -r1.41 --- configure.in 5 Jan 2005 05:05:23 -0000 1.40 +++ configure.in 6 Jan 2005 23:10:51 -0000 1.41 @@ -106,6 +106,8 @@ ]) ecore_cflags=`$ECORE_CONFIG --cflags` ecore_libs=`$ECORE_CONFIG --libs` +AC_SUBST(ecore_cflags) +AC_SUBST(ecore_libs) AC_ARG_WITH(edje-config, [ --with-edje-config=EDJE_CONFIG use edje-config specified ], |
From: <enl...@li...> - 2005-01-06 23:11:43
|
Enlightenment CVS committal Author : handyande Project : e17 Module : apps/e Dir : e17/apps/e/src/lib Modified Files: .cvsignore Makefile.am Added Files: E.h e_main.c e_private.h Log Message: Added libe check E.h for its functionality, currently you can make a nice front end for loading/enabling libs or setting the background Need to add Ecore_Event or similar for callbacks fo things like module_list or background_get etc See what you think =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/lib/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- .cvsignore 2 Dec 2004 18:41:28 -0000 1.1 +++ .cvsignore 6 Jan 2005 23:10:53 -0000 1.2 @@ -1,2 +1,6 @@ Makefile Makefile.in +.deps +.libs +e_main.lo +libe.la =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/lib/Makefile.am,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- Makefile.am 25 Nov 2004 03:37:45 -0000 1.1 +++ Makefile.am 6 Jan 2005 23:10:56 -0000 1.2 @@ -1,3 +1,16 @@ -MAINTAINERCLEANFILES = Makefile.in -INCLUDES = -I/usr/local/include \ - -I$(includedir) +MAINTAINERCLEANFILES = Makefile.in +INCLUDES = -I/usr/local/include \ + -I$(includedir) \ + -I../bin/ + @ecore_cflags@ + +lib_LTLIBRARIES = libe.la + +include_HEADERS = E.h + +libe_la_SOURCES= \ +e_main.c \ +e_private.h + +libe_la_LIBADD = @ecore_libs@ +libe_la_DEPENDENCIES = $(top_builddir)/config.h |
From: <enl...@li...> - 2005-01-07 11:49:23
|
Enlightenment CVS committal Author : handyande Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: enlightenment-config.in Log Message: Fix enlightenment-config to include libe =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/enlightenment-config.in,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- enlightenment-config.in 9 Dec 2004 19:33:51 -0000 1.3 +++ enlightenment-config.in 7 Jan 2005 11:48:58 -0000 1.4 @@ -39,11 +39,11 @@ echo @VERSION@ ;; --cflags) - includes=-I@includedir@/enlightenment + includes="-I@includedir@ -I@includedir@/enlightenment" echo $includes ;; --libs) - libdirs=-L@libdir@ + libdirs="-L@libdir@ -le" echo $libdirs ;; *) |
From: <enl...@li...> - 2005-01-07 20:29:52
|
Enlightenment CVS committal Author : handyande Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_border.c Log Message: Fix seg for apps with no winclass =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_border.c,v retrieving revision 1.49 retrieving revision 1.50 diff -u -3 -r1.49 -r1.50 --- e_border.c 7 Jan 2005 04:02:03 -0000 1.49 +++ e_border.c 7 Jan 2005 20:29:45 -0000 1.50 @@ -2495,7 +2495,7 @@ e_menu_item_label_set(mi, "Edit Icon"); e_menu_item_callback_set(mi, _e_border_menu_cb_icon_edit, a->path); } - else + else if (bd->client.icccm.class) /* icons with no class useless to borders */ { static char buf[PATH_MAX + 50]; char *name, *homedir; @@ -2508,7 +2508,7 @@ l = strlen(name); for (i = 0; i < l; i++) { - if (name[i] == ' ') name[i] = '_'; + if (name[i] == ' ') name[i] = '_'; } /* previously this could be null, but it will exist now */ homedir = e_user_homedir_get(); @@ -2516,8 +2516,8 @@ snprintf(buf, sizeof(buf), "--win-class %s %s/.e/e/applications/all/%s.eapp", bd->client.icccm.class, homedir, name); - mi = e_menu_item_new(m); - e_menu_item_label_set(mi, "Create Icon"); + mi = e_menu_item_new(m); + e_menu_item_label_set(mi, "Create Icon"); e_menu_item_callback_set(mi, _e_border_menu_cb_icon_edit, buf); } |
From: <enl...@li...> - 2005-01-08 01:44:44
|
Enlightenment CVS committal Author : handyande Project : e17 Module : apps/e Dir : e17/apps/e/src/lib Modified Files: E.h e_main.c Log Message: OK, added callbacks, hope it is OK, can be tweaked ;) This allows module_list : added background_get for Codeworrior :) =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/lib/E.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- E.h 6 Jan 2005 23:10:55 -0000 1.1 +++ E.h 8 Jan 2005 01:44:36 -0000 1.2 @@ -19,11 +19,22 @@ # endif #endif +extern EAPI int E_RESPONSE_MODULE_LIST; +extern EAPI int E_RESPONSE_BACKGROUND_GET; +typedef struct _E_Response_Module_List E_Response_Module_List; +typedef struct _E_Response_Background_Get E_Response_Background_Get; - - - +struct _E_Response_Module_List +{ + char *name; + char enabled; +}; + +struct _E_Response_Background_Get +{ + char *data; +}; #ifdef __cplusplus @@ -38,7 +49,9 @@ int enable); EAPI void e_module_loaded_set (const char *module, int load); + EAPI void e_module_list (void); EAPI void e_background_set (const char *bgfile); + EAPI void e_background_get (void); #ifdef __cplusplus =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/lib/e_main.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_main.c 6 Jan 2005 23:10:56 -0000 1.1 +++ e_main.c 8 Jan 2005 01:44:36 -0000 1.2 @@ -25,9 +25,13 @@ static int _e_ipc_init(const char *display); static void _e_ipc_shutdown(void); +static int _e_cb_server_data(void *data, int type, void *event); static Ecore_Ipc_Server *_e_ipc_server = NULL; +int E_RESPONSE_MODULE_LIST = 0; +int E_RESPONSE_BACKGROUND_GET = 0; + int e_init(const char* display) { @@ -58,6 +62,12 @@ return 0; } + if (!E_RESPONSE_MODULE_LIST) + { + E_RESPONSE_MODULE_LIST = ecore_event_type_new(); + E_RESPONSE_BACKGROUND_GET = ecore_event_type_new(); + } + return 1; } @@ -108,6 +118,14 @@ } void +e_module_list(void) +{ + ecore_ipc_server_send(_e_ipc_server, E_IPC_DOMAIN_REQUEST, + E_IPC_OP_MODULE_LIST, 0/*ref*/, 0/*ref_to*/, + 0/*response*/, NULL, 0); +} + +void e_background_set(const char *bgfile) { if (!bgfile) @@ -118,6 +136,14 @@ strlen(bgfile)); } +void +e_background_get(void) +{ + ecore_ipc_server_send(_e_ipc_server, E_IPC_DOMAIN_REQUEST, + E_IPC_OP_BG_GET, 0/*ref*/, 0/*ref_to*/, + 0/*response*/, NULL, 0); +} + static int _e_ipc_init(const char *display) { @@ -132,9 +158,9 @@ /* similar... */ if (!_e_ipc_server) return 0; -// ecore_event_handler_add(ECORE_IPC_EVENT_SERVER_ADD, _e_ipc_cb_server_add, NULL); -// ecore_event_handler_add(ECORE_IPC_EVENT_SERVER_DEL, _e_ipc_cb_server_del, NULL); -// ecore_event_handler_add(ECORE_IPC_EVENT_SERVER_DATA, _e_ipc_cb_server_data, NULL); +// ecore_event_handler_add(ECORE_IPC_EVENT_SERVER_ADD, _e_cb_server_add, NULL); +// ecore_event_handler_add(ECORE_IPC_EVENT_SERVER_DEL, _e_cb_server_del, NULL); + ecore_event_handler_add(ECORE_IPC_EVENT_SERVER_DATA, _e_cb_server_data, NULL); return 1; } @@ -149,4 +175,54 @@ } } +static int +_e_cb_server_data(void *data, int type, void *event) +{ + Ecore_Ipc_Event_Server_Data *e; + + e = event; + type = E_IPC_OP_MODULE_LIST; + switch (e->minor) + { + case E_IPC_OP_MODULE_LIST_REPLY: + if (e->data) + { + char *p; + + p = e->data; + while (p < (char *)(e->data + e->size)) + { + E_Response_Module_List *res; + + res = calloc(1, sizeof(E_Response_Module_List)); + res->name = p; + p += strlen(res->name); + if (p < (char *)(e->data + e->size)) + { + p++; + if (p < (char *)(e->data + e->size)) + { + res->enabled = *p; + p++; + ecore_event_add(E_RESPONSE_MODULE_LIST, res, + NULL, NULL); + } + } + } + } + break; + case E_IPC_OP_BG_GET_REPLY: + { + E_Response_Background_Get *res; + + res = calloc(1, sizeof(E_Response_Background_Get)); + res->data = e->data; + ecore_event_add(E_RESPONSE_BACKGROUND_GET, res, NULL, NULL); + break; + } + default: + break; + } + return 1; +} |
From: <enl...@li...> - 2005-01-08 01:44:46
|
Enlightenment CVS committal Author : handyande Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_ipc.c e_ipc.h Log Message: OK, added callbacks, hope it is OK, can be tweaked ;) This allows module_list : added background_get for Codeworrior :) =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_ipc.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_ipc.c 3 Jan 2005 09:34:24 -0000 1.6 +++ e_ipc.c 8 Jan 2005 01:44:36 -0000 1.7 @@ -199,6 +199,20 @@ } e_config_save_queue(); } + break; + case E_IPC_OP_BG_GET: + { + char *bg; + bg = e_config->desktop_default_background; + if (!bg) + bg = ""; + ecore_ipc_client_send(e->client, + E_IPC_DOMAIN_REPLY, + E_IPC_OP_BG_GET_REPLY, + 0/*ref*/, 0/*ref_to*/, 0/*response*/, + bg, strlen(bg)); + } + break; default: break; } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_ipc.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_ipc.h 1 Dec 2004 07:01:31 -0000 1.4 +++ e_ipc.h 8 Jan 2005 01:44:36 -0000 1.5 @@ -19,6 +19,8 @@ E_IPC_OP_MODULE_LIST, E_IPC_OP_MODULE_LIST_REPLY, E_IPC_OP_BG_SET, + E_IPC_OP_BG_GET, + E_IPC_OP_BG_GET_REPLY, E_IPC_OP_LAST } E_Ipc_Op; |
From: <enl...@li...> - 2005-01-08 14:41:32
|
Enlightenment CVS committal Author : handyande Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_desk.c e_desk.h e_int_menus.c e_zone.c e_zone.h Log Message: OK, now we have a 2D set of desktops to each zone :) - callbacks not in yet so stuck with 2x2 for now - but wanted to get this in =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_desk.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- e_desk.c 8 Jan 2005 07:10:13 -0000 1.10 +++ e_desk.c 8 Jan 2005 14:41:21 -0000 1.11 @@ -25,7 +25,7 @@ } E_Desk * -e_desk_new(E_Zone *zone) +e_desk_new(E_Zone *zone, int x, int y) { E_Desk *desk; char name[40]; @@ -38,11 +38,11 @@ desk->clients = NULL; desk->zone = zone; desk->num = ++desk_count; - snprintf(name, sizeof(name), "Desktop %d", desk->num); + snprintf(name, sizeof(name), "Desktop %d, %d", x, y); desk->name = strdup(name); e_object_ref(E_OBJECT(zone)); - zone->desks = evas_list_append(zone->desks, desk); + zone->desks[x + (y * zone->desk_x_count)] = (E_Object *) desk; return desk; } @@ -59,6 +59,7 @@ e_desk_show(E_Desk *desk) { Evas_List *l; + int x, y; E_OBJECT_CHECK(desk); if (desk->visible) return; @@ -80,14 +81,49 @@ } } - for (l = desk->zone->desks; l; l = l->next) + for (x = 0; x < desk->zone->desk_x_count; x++) { - E_Desk *d = l->data; - d->visible = 0; + for (y = 0; y < desk->zone->desk_y_count; y++) + { + E_Desk *next; + next = + (E_Desk *)desk->zone->desks[x + (y * desk->zone->desk_x_count)]; + next->visible = 0; + if (next == desk) + { + desk->zone->desk_x_current = x; + desk->zone->desk_y_current = y; + } + } } desk->visible = 1; } +/* FIXME replace e_desk_remove etc with these row / col operations */ +void +e_desk_row_add(E_Zone *zone) +{ + +} + +void +e_desk_row_remove(E_Zone *zone) +{ + +} + +void +e_desk_col_add(E_Zone *zone) +{ + +} + +void +e_desk_col_remove(E_Zone *zone) +{ + +} +/* void e_desk_remove(E_Desk *desk) { @@ -114,22 +150,15 @@ evas_list_free(desk->clients); e_object_del(E_OBJECT(desk)); } - +*/ E_Desk * e_desk_current_get(E_Zone *zone) { Evas_List *l; E_OBJECT_CHECK_RETURN(zone, NULL); - - for (l = zone->desks; l; l = l->next) - { - E_Desk *desk = l->data; - if (desk->visible) - return desk; - } - - return NULL; + + return (E_Desk *)zone->desks[zone->desk_x_current + (zone->desk_y_current * zone->desk_x_count)]; } void @@ -137,23 +166,26 @@ { Evas_List *l; E_Desk *desk; + int x, y; E_OBJECT_CHECK(zone); - if (evas_list_count(zone->desks) < 2) + if (zone->desk_x_count < 2 && zone->desk_y_count < 2) return; - /* Locate the position of the current desktop in the list */ - desk = e_desk_current_get(zone); - l = evas_list_find_list(zone->desks, desk); - if (!l) return; /* Couldn't help putting this here */ - - l = l->next; - if (!l) l = zone->desks; /* Wraparound */ - - /* Show the desktop */ - desk = l->data; - e_desk_show(desk); + x = zone->desk_x_current; + y = zone->desk_y_current; + + x++; + if (x == zone->desk_x_count) + { + x = 0; + y++; + if (y == zone->desk_y_count) + y = 0; + } + + e_desk_show((E_Desk *)zone->desks[x + (y * zone->desk_x_count)]); } void @@ -161,23 +193,27 @@ { Evas_List *l; E_Desk *desk; + int x, y; E_OBJECT_CHECK(zone); - - if (evas_list_count(zone->desks) < 2) - return; - - /* Locate the position of the current desktop in the list */ - desk = e_desk_current_get(zone); - l = evas_list_find_list(zone->desks, desk); - if (!l) return; /* Couldn't help putting this here */ - - l = l->prev; - if (!l) l = evas_list_last(zone->desks); /* Wraparound */ - /* Show the desktop */ - desk = l->data; - e_desk_show(desk); + if (zone->desk_x_count < 2 && zone->desk_y_count < 2) + return; + + x = zone->desk_x_current; + y = zone->desk_y_current; + + x--; + if (x < 0) + { + x = zone->desk_x_count - 1; + y--; + if (y < 0) + y = zone->desk_y_count - 1; + + } + + e_desk_show((E_Desk *)zone->desks[x + (y * zone->desk_x_count)]); } static void @@ -186,7 +222,7 @@ E_Zone *zone = desk->zone; if (desk->name) free(desk->name); - zone->desks = evas_list_remove(zone->desks, desk); +// zone->desks = evas_list_remove(zone->desks, desk); e_object_unref(E_OBJECT(desk->zone)); free(desk); } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_desk.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_desk.h 5 Jan 2005 10:37:53 -0000 1.4 +++ e_desk.h 8 Jan 2005 14:41:21 -0000 1.5 @@ -19,13 +19,16 @@ EAPI int e_desk_init(void); EAPI int e_desk_shutdown(void); -EAPI E_Desk *e_desk_new(E_Zone *zone); +EAPI E_Desk *e_desk_new(E_Zone *zone, int x, int y); EAPI void e_desk_name_set(E_Desk *desk, const char *name); EAPI void e_desk_show(E_Desk *desk); EAPI E_Desk *e_desk_current_get(E_Zone *zone); EAPI void e_desk_next(E_Zone *zone); EAPI void e_desk_prev(E_Zone *zone); -EAPI void e_desk_remove(E_Desk *desk); +EAPI void e_desk_row_add(E_Zone *zone); +EAPI void e_desk_row_remove(E_Zone *zone); +EAPI void e_desk_col_add(E_Zone *zone); +EAPI void e_desk_col_remove(E_Zone *zone); #endif =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_menus.c,v retrieving revision 1.23 retrieving revision 1.24 diff -u -3 -r1.23 -r1.24 --- e_int_menus.c 7 Jan 2005 11:26:56 -0000 1.23 +++ e_int_menus.c 8 Jan 2005 14:41:21 -0000 1.24 @@ -26,8 +26,10 @@ static void _e_int_menus_clients_item_cb (void *data, E_Menu *m, E_Menu_Item *mi); static void _e_int_menus_desktops_pre_cb (void *data, E_Menu *m); static void _e_int_menus_desktops_item_cb(void *data, E_Menu *m, E_Menu_Item *mi); -static void _e_int_menus_desktops_add_cb (void *data, E_Menu *m, E_Menu_Item *mi); -static void _e_int_menus_desktops_del_cb (void *data, E_Menu *m, E_Menu_Item *mi); +static void _e_int_menus_desktops_row_add_cb (void *data, E_Menu *m, E_Menu_Item *mi); +static void _e_int_menus_desktops_row_del_cb (void *data, E_Menu *m, E_Menu_Item *mi); +static void _e_int_menus_desktops_col_add_cb (void *data, E_Menu *m, E_Menu_Item *mi); +static void _e_int_menus_desktops_col_del_cb (void *data, E_Menu *m, E_Menu_Item *mi); /* externally accessible functions */ E_Menu * @@ -303,28 +305,17 @@ evas_list_free(m->items); m->items = NULL; - mi = e_menu_item_new(m); - e_menu_item_label_set(mi, "New Desktop"); - e_menu_item_callback_set(mi, _e_int_menus_desktops_add_cb, NULL); - - mi = e_menu_item_new(m); - e_menu_item_label_set(mi, "Remove This Desktop"); - e_menu_item_callback_set(mi, _e_int_menus_desktops_del_cb, NULL); - - mi = e_menu_item_new(m); - e_menu_item_separator_set(mi, 1); - root = e_menu_root_get(m); /* Get the desktop list for this zone */ /* FIXME: Menu code needs to determine what zone menu was clicked in */ if (root && root->con) { + int i; E_Zone *zone = e_zone_current_get(root->con); - for (l = zone->desks; l; l = l->next) + for (i = 0; i < zone->desk_x_count * zone->desk_y_count; i++) { - E_Desk *desk = l->data; - desks = evas_list_append(desks, desk); + desks = evas_list_append(desks, zone->desks[i]); } for (l = desks; l; l = l->next) @@ -340,49 +331,85 @@ } } + mi = e_menu_item_new(m); + e_menu_item_separator_set(mi, 1); + + mi = e_menu_item_new(m); + e_menu_item_label_set(mi, "New Row of Desktops"); + e_menu_item_callback_set(mi, _e_int_menus_desktops_row_add_cb, NULL); + + mi = e_menu_item_new(m); + e_menu_item_label_set(mi, "Remove Row of Desktops"); + e_menu_item_callback_set(mi, _e_int_menus_desktops_row_del_cb, NULL); + + mi = e_menu_item_new(m); + e_menu_item_label_set(mi, "New Column of Desktops"); + e_menu_item_callback_set(mi, _e_int_menus_desktops_col_add_cb, NULL); + + mi = e_menu_item_new(m); + e_menu_item_label_set(mi, "Remove Colum of Desktops"); + e_menu_item_callback_set(mi, _e_int_menus_desktops_col_del_cb, NULL); + + evas_list_free(desks); } /* FIXME: Use the zone the menu was clicked in */ static void -_e_int_menus_desktops_add_cb(void *data, E_Menu *m, E_Menu_Item *mi) +_e_int_menus_desktops_row_add_cb(void *data, E_Menu *m, E_Menu_Item *mi) { E_Menu *root = e_menu_root_get(m); if (root && root->con) { - E_Desk *desk; E_Zone *zone = e_zone_current_get(root->con); - desk = e_desk_new(zone); - e_desk_show(desk); + e_desk_row_add(zone); +// e_desk_show(desk); } } static void -_e_int_menus_desktops_del_cb(void *data, E_Menu *m, E_Menu_Item *mi) +_e_int_menus_desktops_row_del_cb(void *data, E_Menu *m, E_Menu_Item *mi) { E_Menu *root = e_menu_root_get(m); if (root && root->con) { E_Zone *zone; - E_Desk *desk; zone = e_zone_current_get(root->con); - desk = e_desk_current_get(zone); - - if (evas_list_count(zone->desks) > 1) - { - e_desk_remove(desk); - } - else - { - e_error_dialog_show("Enlightenment", "You cannot remove the last desktop."); - } + e_desk_row_remove(zone); + } +} + +static void +_e_int_menus_desktops_col_add_cb(void *data, E_Menu *m, E_Menu_Item *mi) +{ + E_Menu *root = e_menu_root_get(m); + + if (root && root->con) + { + E_Zone *zone = e_zone_current_get(root->con); + e_desk_row_add(zone); + // e_desk_show(desk); } } static void +_e_int_menus_desktops_col_del_cb(void *data, E_Menu *m, E_Menu_Item *mi) +{ + E_Menu *root = e_menu_root_get(m); + + if (root && root->con) + { + E_Zone *zone; + + zone = e_zone_current_get(root->con); + e_desk_row_remove(zone); + } +} + +static void _e_int_menus_desktops_item_cb(void *data, E_Menu *m, E_Menu_Item *mi) { E_Desk *desk = data; =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_zone.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_zone.c 6 Jan 2005 18:41:24 -0000 1.6 +++ e_zone.c 8 Jan 2005 14:41:21 -0000 1.7 @@ -32,6 +32,7 @@ { E_Zone *zone; E_Desk *desk; + int i; zone = E_OBJECT_ALLOC(E_Zone, _e_zone_free); if (!zone) return NULL; @@ -77,10 +78,19 @@ evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_MOVE, _e_zone_cb_bg_mouse_move, zone); } - /* Start off with a single desktop */ - desk = e_desk_new(zone); - e_desk_show(desk); + /* Start off with 4 desktops (2x2) */ + zone->desk_x_count = 2; + zone->desk_y_count = 2; + + zone->desks = + malloc(zone->desk_x_count * zone->desk_y_count * sizeof(E_Desk *)); + + int xx, yy; + for (xx = 1; xx >= 0; xx--) + for(yy = 1; yy >= 0; yy--) + desk = e_desk_new(zone, xx, yy); + e_desk_show(desk); return zone; } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_zone.h,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- e_zone.h 5 Jan 2005 10:37:53 -0000 1.3 +++ e_zone.h 8 Jan 2005 14:41:21 -0000 1.4 @@ -15,7 +15,9 @@ Evas_Object *bg_object; Evas_Object *bg_event_object; - Evas_List *desks; + int desk_x_count, desk_y_count; + int desk_x_current, desk_y_current; + E_Object **desks; /* FIXME: why can this not be E_Desk? */ Evas_List *clients; }; |
From: <enl...@li...> - 2005-01-08 17:32:18
|
Enlightenment CVS committal Author : handyande Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_desk.c e_desk.h e_int_menus.c e_zone.c e_zone.h Log Message: Hook in menu configuring of desktops and dynamic resizing =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_desk.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -3 -r1.11 -r1.12 --- e_desk.c 8 Jan 2005 14:41:21 -0000 1.11 +++ e_desk.c 8 Jan 2005 17:32:07 -0000 1.12 @@ -42,7 +42,6 @@ desk->name = strdup(name); e_object_ref(E_OBJECT(zone)); - zone->desks[x + (y * zone->desk_x_count)] = (E_Object *) desk; return desk; } @@ -86,8 +85,7 @@ for (y = 0; y < desk->zone->desk_y_count; y++) { E_Desk *next; - next = - (E_Desk *)desk->zone->desks[x + (y * desk->zone->desk_x_count)]; + next = e_desk_at_xy_get(desk->zone,x, y); next->visible = 0; if (next == desk) { @@ -103,62 +101,45 @@ void e_desk_row_add(E_Zone *zone) { - + e_zone_desk_count_set(zone, zone->desk_x_count, zone->desk_y_count + 1); } void e_desk_row_remove(E_Zone *zone) { - + if (zone->desk_y_count < 2) + return; + e_zone_desk_count_set(zone, zone->desk_x_count, zone->desk_y_count - 1); } void e_desk_col_add(E_Zone *zone) { - + e_zone_desk_count_set(zone, zone->desk_x_count + 1, zone->desk_y_count); } void e_desk_col_remove(E_Zone *zone) { - -} -/* -void -e_desk_remove(E_Desk *desk) -{ - Evas_List *l; - E_Desk *previous; - - E_OBJECT_CHECK(desk); - if (evas_list_count(desk->zone->desks) < 2) + if (zone->desk_x_count < 2) return; - l = evas_list_find_list(desk->zone->desks, desk); - l = l->prev; - if (!l) l = evas_list_last(desk->zone->desks); - previous = l->data; - - for (l = desk->clients; l; l = l->next) - { - E_Border *bd = l->data; - e_border_desk_set(bd, previous); - } - desk->zone->desks = evas_list_remove(desk->zone->desks, desk); - if (desk->visible) - e_desk_show(previous); - - evas_list_free(desk->clients); - e_object_del(E_OBJECT(desk)); + e_zone_desk_count_set(zone, zone->desk_x_count - 1, zone->desk_y_count); } -*/ + E_Desk * e_desk_current_get(E_Zone *zone) { - Evas_List *l; - E_OBJECT_CHECK_RETURN(zone, NULL); - return (E_Desk *)zone->desks[zone->desk_x_current + (zone->desk_y_current * zone->desk_x_count)]; + return e_desk_at_xy_get(zone, zone->desk_x_current, zone->desk_y_current); +} + +E_Desk * +e_desk_at_xy_get(E_Zone *zone, int x, int y) +{ + E_OBJECT_CHECK_RETURN(zone, NULL); + + return (E_Desk *) zone->desks[x + (y * zone->desk_x_count)]; } void @@ -185,7 +166,7 @@ y = 0; } - e_desk_show((E_Desk *)zone->desks[x + (y * zone->desk_x_count)]); + e_desk_show(e_desk_at_xy_get(zone, x, y)); } void @@ -213,7 +194,7 @@ } - e_desk_show((E_Desk *)zone->desks[x + (y * zone->desk_x_count)]); + e_desk_show(e_desk_at_xy_get(zone, x, y)); } static void =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_desk.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_desk.h 8 Jan 2005 14:41:21 -0000 1.5 +++ e_desk.h 8 Jan 2005 17:32:08 -0000 1.6 @@ -23,6 +23,7 @@ EAPI void e_desk_name_set(E_Desk *desk, const char *name); EAPI void e_desk_show(E_Desk *desk); EAPI E_Desk *e_desk_current_get(E_Zone *zone); +EAPI E_Desk *e_desk_at_xy_get(E_Zone *zone, int x, int y); EAPI void e_desk_next(E_Zone *zone); EAPI void e_desk_prev(E_Zone *zone); EAPI void e_desk_row_add(E_Zone *zone); =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_int_menus.c,v retrieving revision 1.24 retrieving revision 1.25 diff -u -3 -r1.24 -r1.25 --- e_int_menus.c 8 Jan 2005 14:41:21 -0000 1.24 +++ e_int_menus.c 8 Jan 2005 17:32:08 -0000 1.25 @@ -390,8 +390,8 @@ if (root && root->con) { E_Zone *zone = e_zone_current_get(root->con); - e_desk_row_add(zone); - // e_desk_show(desk); + e_desk_col_add(zone); +// e_desk_show(desk); } } @@ -405,7 +405,7 @@ E_Zone *zone; zone = e_zone_current_get(root->con); - e_desk_row_remove(zone); + e_desk_col_remove(zone); } } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_zone.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -3 -r1.7 -r1.8 --- e_zone.c 8 Jan 2005 14:41:21 -0000 1.7 +++ e_zone.c 8 Jan 2005 17:32:08 -0000 1.8 @@ -31,7 +31,6 @@ e_zone_new(E_Container *con, int x, int y, int w, int h) { E_Zone *zone; - E_Desk *desk; int i; zone = E_OBJECT_ALLOC(E_Zone, _e_zone_free); @@ -79,18 +78,12 @@ } /* Start off with 4 desktops (2x2) */ - zone->desk_x_count = 2; - zone->desk_y_count = 2; + zone->desk_x_count = 0; + zone->desk_y_count = 0; + zone->desk_x_current = 0; + zone->desk_y_current = 0; + e_zone_desk_count_set(zone, 2, 2); - zone->desks = - malloc(zone->desk_x_count * zone->desk_y_count * sizeof(E_Desk *)); - - int xx, yy; - for (xx = 1; xx >= 0; xx--) - for(yy = 1; yy >= 0; yy--) - desk = e_desk_new(zone, xx, yy); - - e_desk_show(desk); return zone; } @@ -252,3 +245,47 @@ zone = data; } +void +e_zone_desk_count_set(E_Zone *zone, int x_count, int y_count) +{ + E_Object **new_desks; /* match the bug in e_zone.h */ + E_Desk *desk; + int x, y, reshow; + + new_desks = + malloc(x_count * y_count * sizeof(E_Desk *)); + + for (x = 0; x < x_count; x++) + for(y = 0; y < y_count; y++) + { + if (x < zone->desk_x_count && y < zone->desk_y_count) + desk = (E_Desk *) zone->desks[x + (y * zone->desk_x_count)]; + else + desk = e_desk_new(zone, x, y); + new_desks[x + (y * x_count)] = (E_Object *) desk; + } + +/* FIXME catch thigns that have fallen off the end if we got smaller */ + + if (zone->desks) + free(zone->desks); + zone->desks = new_desks; + + zone->desk_x_count = x_count; + zone->desk_y_count = y_count; + + reshow = 0; + if (zone->desk_x_current >= x_count) + { + zone->desk_x_current = x_count - 1; + reshow = 1; + } + if (zone->desk_y_current >= y_count) + { + zone->desk_y_current = y_count - 1; + reshow = 1; + } + if (reshow) + e_desk_show(e_desk_at_xy_get(zone, x_count - 1, y_count - 1)); +} + =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_zone.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -3 -r1.4 -r1.5 --- e_zone.h 8 Jan 2005 14:41:21 -0000 1.4 +++ e_zone.h 8 Jan 2005 17:32:08 -0000 1.5 @@ -31,6 +31,7 @@ EAPI E_Zone *e_zone_current_get(E_Container *con); EAPI void e_zone_bg_reconfigure(E_Zone *zone); EAPI Evas_List *e_zone_clients_list_get(E_Zone *zone); +EAPI void e_zone_desks_set(E_Zone *zone, int x_count, int y_count); #endif |
From: <enl...@li...> - 2005-01-08 21:22:03
|
Enlightenment CVS committal Author : handyande Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_desk.c e_zone.c e_zone.h Log Message: Move apps on desks being removed to theirnearest valid desk fix a few warnings =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_desk.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- e_desk.c 8 Jan 2005 17:32:07 -0000 1.12 +++ e_desk.c 8 Jan 2005 21:21:56 -0000 1.13 @@ -97,7 +97,6 @@ desk->visible = 1; } -/* FIXME replace e_desk_remove etc with these row / col operations */ void e_desk_row_add(E_Zone *zone) { @@ -107,8 +106,6 @@ void e_desk_row_remove(E_Zone *zone) { - if (zone->desk_y_count < 2) - return; e_zone_desk_count_set(zone, zone->desk_x_count, zone->desk_y_count - 1); } @@ -121,8 +118,6 @@ void e_desk_col_remove(E_Zone *zone) { - if (zone->desk_x_count < 2) - return; e_zone_desk_count_set(zone, zone->desk_x_count - 1, zone->desk_y_count); } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_zone.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -3 -r1.8 -r1.9 --- e_zone.c 8 Jan 2005 17:32:08 -0000 1.8 +++ e_zone.c 8 Jan 2005 21:21:56 -0000 1.9 @@ -249,43 +249,101 @@ e_zone_desk_count_set(E_Zone *zone, int x_count, int y_count) { E_Object **new_desks; /* match the bug in e_zone.h */ - E_Desk *desk; - int x, y, reshow; + E_Desk *desk, *new_desk; + int x, y, xx, yy, moved; + Evas_List *client; + E_Border *bd; - new_desks = - malloc(x_count * y_count * sizeof(E_Desk *)); + xx = x_count; + if (xx < 1) + xx = 1; + yy = y_count; + if (yy < 1) + yy = 1; - for (x = 0; x < x_count; x++) - for(y = 0; y < y_count; y++) + new_desks = malloc(xx * yy * sizeof(E_Desk *)); + + for (x = 0; x < xx; x++) + for(y = 0; y < yy; y++) { if (x < zone->desk_x_count && y < zone->desk_y_count) desk = (E_Desk *) zone->desks[x + (y * zone->desk_x_count)]; else desk = e_desk_new(zone, x, y); - new_desks[x + (y * x_count)] = (E_Object *) desk; + new_desks[x + (y * xx)] = (E_Object *) desk; } -/* FIXME catch thigns that have fallen off the end if we got smaller */ + /* catch windoes that have fallen off the end if we got smaller */ + if (xx < zone->desk_x_count) + for (y = 0; y < zone->desk_y_count; y++) + { + new_desk = (E_Desk *) + zone->desks[xx - 1 + (y * zone->desk_x_count)]; + for (x = xx; x < zone->desk_x_count; x++) + { + desk = (E_Desk *) + zone->desks[x + (y * zone->desk_x_count)]; + + client = desk->clients; + while (client) + { + bd = (E_Border *) client->data; + + new_desk->clients = evas_list_append(new_desk->clients, bd); + bd->desk = new_desk; + client = client->next; + } + evas_list_free(desk->clients); + } + } + if (yy < zone->desk_y_count) + for (x = 0; x < zone->desk_x_count; x++) + { + new_desk = (E_Desk *) + zone->desks[x + ((yy - 1) * zone->desk_x_count)]; + for (y = yy; y < zone->desk_y_count; y++) + { + desk = (E_Desk *) + zone->desks[x + (y * zone->desk_x_count)]; + + client = desk->clients; + while (client) + { + bd = (E_Border *) client->data; + + new_desk->clients = evas_list_append(new_desk->clients, bd); + bd->desk = new_desk; + client = client->next; + } + evas_list_free(desk->clients); + } + } if (zone->desks) free(zone->desks); zone->desks = new_desks; - zone->desk_x_count = x_count; - zone->desk_y_count = y_count; + zone->desk_x_count = xx; + zone->desk_y_count = yy; - reshow = 0; - if (zone->desk_x_current >= x_count) + moved = 0; + if (zone->desk_x_current >= xx) + { + zone->desk_x_current = xx - 1; + moved = 1; + } + if (zone->desk_y_current >= yy) { - zone->desk_x_current = x_count - 1; - reshow = 1; + zone->desk_y_current = yy - 1; + moved = 1; } - if (zone->desk_y_current >= y_count) + if (moved) + e_desk_show(e_desk_at_xy_get(zone, xx - 1, yy - 1)); + else { - zone->desk_y_current = y_count - 1; - reshow = 1; + desk = e_desk_current_get(zone); + desk->visible = 0; + e_desk_show(desk); } - if (reshow) - e_desk_show(e_desk_at_xy_get(zone, x_count - 1, y_count - 1)); } =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_zone.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- e_zone.h 8 Jan 2005 17:32:08 -0000 1.5 +++ e_zone.h 8 Jan 2005 21:21:56 -0000 1.6 @@ -31,7 +31,7 @@ EAPI E_Zone *e_zone_current_get(E_Container *con); EAPI void e_zone_bg_reconfigure(E_Zone *zone); EAPI Evas_List *e_zone_clients_list_get(E_Zone *zone); -EAPI void e_zone_desks_set(E_Zone *zone, int x_count, int y_count); +EAPI void e_zone_desk_count_set(E_Zone *zone, int x_count, int y_count); #endif |
From: <enl...@li...> - 2005-01-08 22:09:25
|
Enlightenment CVS committal Author : handyande Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_config.c e_config.h e_zone.c Log Message: remember how many desks we like this is _not_ on a per zone basis this does _not_ remember your desktop names like e16 really ;) =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config.c,v retrieving revision 1.12 retrieving revision 1.13 diff -u -3 -r1.12 -r1.13 --- e_config.c 2 Jan 2005 02:39:43 -0000 1.12 +++ e_config.c 8 Jan 2005 22:09:16 -0000 1.13 @@ -52,6 +52,8 @@ E_CONFIG_VAL(D, T, framerate, DOUBLE); E_CONFIG_VAL(D, T, image_cache, INT); E_CONFIG_VAL(D, T, font_cache, INT); + E_CONFIG_VAL(D, T, zone_desks_x_count, INT); + E_CONFIG_VAL(D, T, zone_desks_y_count, INT); E_CONFIG_LIST(D, T, modules, _e_config_module_edd); e_config = e_config_domain_load("e", _e_config_edd); @@ -69,6 +71,8 @@ e_config->framerate = 30.0; e_config->image_cache = 2048; e_config->font_cache = 512; + e_config->zone_desks_x_count = 1; + e_config->zone_desks_y_count = 1; { E_Config_Module *em; =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_config.h 20 Dec 2004 21:33:31 -0000 1.6 +++ e_config.h 8 Jan 2005 22:09:16 -0000 1.7 @@ -18,6 +18,8 @@ double framerate; int image_cache; int font_cache; + int zone_desks_x_count; + int zone_desks_y_count; Evas_List *modules; }; =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_zone.c,v retrieving revision 1.9 retrieving revision 1.10 diff -u -3 -r1.9 -r1.10 --- e_zone.c 8 Jan 2005 21:21:56 -0000 1.9 +++ e_zone.c 8 Jan 2005 22:09:16 -0000 1.10 @@ -77,12 +77,12 @@ evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_MOVE, _e_zone_cb_bg_mouse_move, zone); } - /* Start off with 4 desktops (2x2) */ zone->desk_x_count = 0; zone->desk_y_count = 0; zone->desk_x_current = 0; zone->desk_y_current = 0; - e_zone_desk_count_set(zone, 2, 2); + e_zone_desk_count_set(zone, e_config->zone_desks_x_count, + e_config->zone_desks_y_count); return zone; } @@ -345,5 +345,8 @@ desk->visible = 0; e_desk_show(desk); } + e_config->zone_desks_x_count = xx; + e_config->zone_desks_y_count = yy; + e_config_save_queue(); } |
From: <enl...@li...> - 2005-01-09 18:58:19
|
Enlightenment CVS committal Author : handyande Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_zone.c e_zone.h Log Message: Expose desktop geometry =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_zone.c,v retrieving revision 1.10 retrieving revision 1.11 diff -u -3 -r1.10 -r1.11 --- e_zone.c 8 Jan 2005 22:09:16 -0000 1.10 +++ e_zone.c 9 Jan 2005 18:58:13 -0000 1.11 @@ -350,3 +350,9 @@ e_config_save_queue(); } +void +e_zone_desk_count_get(E_Zone *zone, int *x_count, int *y_count) +{ + *x_count = zone->desk_x_count; + *y_count = zone->desk_y_count; +} =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_zone.h,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_zone.h 8 Jan 2005 21:21:56 -0000 1.6 +++ e_zone.h 9 Jan 2005 18:58:13 -0000 1.7 @@ -32,6 +32,7 @@ EAPI void e_zone_bg_reconfigure(E_Zone *zone); EAPI Evas_List *e_zone_clients_list_get(E_Zone *zone); EAPI void e_zone_desk_count_set(E_Zone *zone, int x_count, int y_count); +EAPI void e_zone_desk_count_get(E_Zone *zone, int *x_count, int *y_count); #endif |
From: <enl...@li...> - 2005-01-09 18:59:08
|
Enlightenment CVS committal Author : handyande Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/pager Log Message: Directory /cvsroot/enlightenment/e17/apps/e/src/modules/pager added to the repository |
From: <enl...@li...> - 2005-01-09 19:02:26
|
Enlightenment CVS committal Author : handyande Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/pager Added Files: Makefile.am e_mod_main.c e_mod_main.h module_icon.png Log Message: Added start of pager module need to add windows to the desk previews will not update properly all the time, need to add events etc please someone theme this to fit in with default theme better - thanks :) |
From: <enl...@li...> - 2005-01-09 19:02:27
|
Enlightenment CVS committal Author : handyande Project : e17 Module : apps/e Dir : e17/apps/e/data/themes Modified Files: default.edc Log Message: Added start of pager module need to add windows to the desk previews will not update properly all the time, need to add events etc please someone theme this to fit in with default theme better - thanks :) |
From: <enl...@li...> - 2005-01-09 19:02:54
|
Enlightenment CVS committal Author : handyande Project : e17 Module : apps/e Dir : e17/apps/e Modified Files: configure.in Log Message: Added start of pager module need to add windows to the desk previews will not update properly all the time, need to add events etc please someone theme this to fit in with default theme better - thanks :) =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/configure.in,v retrieving revision 1.41 retrieving revision 1.42 diff -u -3 -r1.41 -r1.42 --- configure.in 6 Jan 2005 23:10:51 -0000 1.41 +++ configure.in 9 Jan 2005 19:02:15 -0000 1.42 @@ -188,6 +188,7 @@ src/modules/ibar/Makefile src/modules/dropshadow/Makefile src/modules/clock/Makefile +src/modules/pager/Makefile src/modules/flame/Makefile src/modules/snow/Makefile src/modules/battery/Makefile |
From: <enl...@li...> - 2005-01-09 19:02:55
|
Enlightenment CVS committal Author : handyande Project : e17 Module : apps/e Dir : e17/apps/e/src/modules Modified Files: Makefile.am Log Message: Added start of pager module need to add windows to the desk previews will not update properly all the time, need to add events etc please someone theme this to fit in with default theme better - thanks :) =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- Makefile.am 2 Jan 2005 02:39:43 -0000 1.6 +++ Makefile.am 9 Jan 2005 19:02:18 -0000 1.7 @@ -4,6 +4,7 @@ ibar \ dropshadow \ clock \ +pager \ flame \ snow \ battery \ |
From: <enl...@li...> - 2005-01-09 19:06:58
|
Enlightenment CVS committal Author : handyande Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/pager Modified Files: e_mod_main.c Log Message: remove debug and show pager by default =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/modules/pager/e_mod_main.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -3 -r1.1 -r1.2 --- e_mod_main.c 9 Jan 2005 19:02:18 -0000 1.1 +++ e_mod_main.c 9 Jan 2005 19:06:52 -0000 1.2 @@ -309,7 +309,6 @@ newy = (double)p->fy / (double)(hh - p->fy); if (p->move && (p->conf->x == newx) && (p->conf->y == newy)) { -printf("clicked\n"); int x, y, w, h, xcount, ycount, cx, cy; E_Zone *zone; E_Desk *desk; @@ -323,16 +322,14 @@ for (x = 0; x < xcount; x++) for (y = 0; y < ycount; y++) { -printf("test %d, %d\n", x, y); int left, right, top, bottom; left = p->fx + x * w; right = left + w; top = p->fy + y * h; bottom = top + h; -printf("l %d r %d t %d b %d = %d, %d\n", left, right, top, bottom, cx, cy); + if (left <= cx && cx < right && top <= cy && cy < bottom) { -printf("matched %d, %d\n", x, y); desk = e_desk_at_xy_get(zone, x, y); e_desk_show(desk); evas_object_move(p->screen, left, top); |
From: <enl...@li...> - 2005-01-09 19:06:59
|
Enlightenment CVS committal Author : handyande Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_config.c Log Message: remove debug and show pager by default =================================================================== RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_config.c,v retrieving revision 1.13 retrieving revision 1.14 diff -u -3 -r1.13 -r1.14 --- e_config.c 8 Jan 2005 22:09:16 -0000 1.13 +++ e_config.c 9 Jan 2005 19:06:51 -0000 1.14 @@ -96,6 +96,10 @@ em->name = strdup("temperature"); e_config->modules = evas_list_append(e_config->modules, em); em->enabled = 1; + em = E_NEW(E_Config_Module, 1); + em->name = strdup("pager"); + e_config->modules = evas_list_append(e_config->modules, em); + em->enabled = 1; } } |
From: <enl...@li...> - 2005-01-09 19:17:14
|
Enlightenment CVS committal Author : handyande Project : e17 Module : apps/e Dir : e17/apps/e/data/themes/images Added Files: e17_pager_desk.png e17_pager_screen.png Log Message: oops, images ;) |
From: <enl...@li...> - 2005-01-09 19:17:57
|
Enlightenment CVS committal Author : handyande Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/pager Added Files: .cvsignore Log Message: oops, images ;) |
From: <enl...@li...> - 2005-01-09 23:39:27
|
Enlightenment CVS committal Author : handyande Project : e17 Module : apps/e Dir : e17/apps/e/data/themes/images Added Files: e17_pager_window.png Log Message: Add some needed frees fix a save bug add window listings as before these will not update unles you force a refresh |