Enlightenment CVS committal
Author : sebastid
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_hints.c e_hints.h e_main.c
Log Message:
Cleanup.
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_hints.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- e_hints.c 3 Jun 2005 12:23:34 -0000 1.42
+++ e_hints.c 3 Jun 2005 16:35:29 -0000 1.43
@@ -111,7 +111,53 @@
void
e_hints_manager_init(E_Manager *man)
{
+ /* Set desktop count, desktop names and workarea */
+ int i = 0, num = 0;
+ unsigned int *areas = NULL;
+ Evas_List *ml, *cl;
+ Ecore_X_Window *vroots = NULL;
+ /* FIXME: Desktop names not yet implemented */
+/* char **names; */
+
e_hints_e16_comms_pretend(man);
+
+ num = evas_list_count(man->containers);
+
+ vroots = calloc(num, sizeof(Ecore_X_Window));
+ if (!vroots) return;
+
+/* names = calloc(num, sizeof(char *));*/
+
+ areas = calloc(4 * num, sizeof(unsigned int));
+ if (!areas)
+ {
+ free(vroots);
+ return;
+ }
+
+ for (cl = man->containers; cl; cl = cl->next)
+ {
+ E_Container *c;
+
+ c = cl->data;
+ areas[4 * i] = c->x;
+ areas[4 * i + 1] = c->y;
+ areas[4 * i + 2] = c->w;
+ areas[4 * i + 3] = c->h;
+ vroots[i++] = c->win;
+ }
+
+#if 0
+ ecore_x_netwm_desk_count_set(man->root, num);
+#endif
+ if (e_config->use_virtual_roots)
+ {
+ ecore_x_netwm_desk_roots_set(man->root, num, vroots);
+ }
+ ecore_x_netwm_desk_workareas_set(man->root, num, areas);
+
+ free(vroots);
+ free(areas);
}
/* FIXME, this should set the list in map order, not stack order */
@@ -245,66 +291,6 @@
}
void
-e_hints_desktop_config_set(void)
-{
- /* Set desktop count, desktop names and workarea */
-
- int i = 0, num = 0;
- unsigned int *areas = NULL;
- E_Manager *m;
- E_Container *c;
- Evas_List *ml, *cl;
- Ecore_X_Window *vroots = NULL;
- /* FIXME: Desktop names not yet implemented */
-/* char **names; */
-
- for (ml = e_manager_list(); ml; ml = ml->next)
- {
- m = ml->data;
- num += evas_list_count(m->containers);
- }
-
- vroots = calloc(num, sizeof(Ecore_X_Window));
- if (!vroots) return;
-
-/* names = calloc(num, sizeof(char *));*/
-
- areas = calloc(4 * num, sizeof(unsigned int));
- if (!areas)
- {
- free(vroots);
- return;
- }
-
- for (ml = e_manager_list(); ml; ml=ml->next)
- {
- m = ml->data;
- for (cl = m->containers; cl; cl=cl->next)
- {
- c = cl->data;
- areas[4 * i] = c->x;
- areas[4 * i + 1] = c->y;
- areas[4 * i + 2] = c->w;
- areas[4 * i + 3] = c->h;
- vroots[i++] = c->win;
- }
- }
-
- for (ml = e_manager_list(); ml; ml = ml->next)
- {
- m = ml->data;
- ecore_x_netwm_desk_count_set(m->root, num);
- if (e_config->use_virtual_roots)
- {
- ecore_x_netwm_desk_roots_set(m->root, num, vroots);
- }
- ecore_x_netwm_desk_workareas_set(m->root, num, areas);
- }
- free(vroots);
- free(areas);
-}
-
-void
e_hints_window_init(E_Border *bd)
{
/* Don't need fetch flag, is onlt called from new border */
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_hints.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- e_hints.h 29 May 2005 11:37:18 -0000 1.16
+++ e_hints.h 3 Jun 2005 16:35:29 -0000 1.17
@@ -14,8 +14,6 @@
EAPI void e_hints_active_window_set(E_Manager *man, E_Border *bd);
-EAPI void e_hints_desktop_config_set(void);
-
EAPI void e_hints_window_init(E_Border *bd);
EAPI void e_hints_window_state_set(E_Border *bd);
EAPI void e_hints_window_state_get(E_Border *bd);
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/e/src/bin/e_main.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -3 -r1.89 -r1.90
--- e_main.c 2 Jun 2005 09:49:07 -0000 1.89
+++ e_main.c 3 Jun 2005 16:35:29 -0000 1.90
@@ -660,12 +660,8 @@
con = e_container_new(man);
if (con)
{
- e_manager_manage_windows(man);
- if (e_config->use_virtual_roots)
- {
- ecore_x_netwm_desk_roots_set(man->root, 1, &(con->win));
- }
e_container_show(con);
+ e_manager_manage_windows(man);
}
else
{
-------------------------------------------------------
This SF.Net email is sponsored by Yahoo.
Introducing Yahoo! Search Developer Network - Create apps using Yahoo!
Search APIs Find out how you can build Yahoo! directly into your own
Applications - visit http://developer.yahoo.net/?fr=offad-ysdn-ostg-q22005
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
