Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
Tag: branch-exp
groups.c session.c
Log Message:
Cleanups.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/groups.c,v
retrieving revision 1.57.2.8
retrieving revision 1.57.2.9
diff -u -3 -r1.57.2.8 -r1.57.2.9
--- groups.c 24 Dec 2004 14:03:53 -0000 1.57.2.8
+++ groups.c 28 Dec 2004 18:59:54 -0000 1.57.2.9
@@ -357,52 +357,47 @@
void
SaveGroups(void)
{
- Group **groups = NULL;
+ Group **groups;
int i, num_groups;
+ FILE *f;
+ char s[1024];
groups = (Group **) ListItemType(&num_groups, LIST_TYPE_GROUP);
- if (groups)
+ if (!groups)
+ return;
+
+ Esnprintf(s, sizeof(s), "%s.groups", EGetSavePrefix());
+ f = fopen(s, "w");
+ if (!f)
+ goto done;
+
+ for (i = 0; i < num_groups; i++)
{
- FILE *f;
- char s[1024];
+ if (!groups[i]->members)
+ continue;
- Esnprintf(s, sizeof(s), "%s/...e_session-XXXXXX.groups.%i", EDirUser(),
- VRoot.scr);
- f = fopen(s, "w");
- if (f)
- {
- for (i = 0; i < num_groups; i++)
- {
- if (groups[i]->members)
- {
- /* Only if the group should be remembered, write info */
- if (groups[i]->members[0]->snap)
- {
- if (groups[i]->members[0]->snap->num_groups)
- {
- fprintf(f, "NEW: %i\n", groups[i]->index);
- fprintf(f, "ICONIFY: %i\n",
- groups[i]->cfg.iconify);
- fprintf(f, "KILL: %i\n", groups[i]->cfg.kill);
- fprintf(f, "MOVE: %i\n", groups[i]->cfg.move);
- fprintf(f, "RAISE: %i\n",
- groups[i]->cfg.raise);
- fprintf(f, "SET_BORDER: %i\n",
- groups[i]->cfg.set_border);
- fprintf(f, "STICK: %i\n",
- groups[i]->cfg.stick);
- fprintf(f, "SHADE: %i\n",
- groups[i]->cfg.shade);
- fprintf(f, "MIRROR: %i\n",
- groups[i]->cfg.mirror);
- }
- }
- }
- }
- fclose(f);
- }
- Efree(groups);
+ /* Only if the group should be remembered, write info */
+ if (!groups[i]->members[0]->snap)
+ continue;
+
+ if (!groups[i]->members[0]->snap->num_groups)
+ continue;
+
+ fprintf(f, "NEW: %i\n", groups[i]->index);
+ fprintf(f, "ICONIFY: %i\n", groups[i]->cfg.iconify);
+ fprintf(f, "KILL: %i\n", groups[i]->cfg.kill);
+ fprintf(f, "MOVE: %i\n", groups[i]->cfg.move);
+ fprintf(f, "RAISE: %i\n", groups[i]->cfg.raise);
+ fprintf(f, "SET_BORDER: %i\n", groups[i]->cfg.set_border);
+ fprintf(f, "STICK: %i\n", groups[i]->cfg.stick);
+ fprintf(f, "SHADE: %i\n", groups[i]->cfg.shade);
+ fprintf(f, "MIRROR: %i\n", groups[i]->cfg.mirror);
}
+ fclose(f);
+
+ done:
+ if (groups)
+ Efree(groups);
}
static void
@@ -410,82 +405,81 @@
{
FILE *f;
char s[1024];
+ Group *g = NULL;
- Esnprintf(s, sizeof(s), "%s/...e_session-XXXXXX.groups.%i", EDirUser(),
- VRoot.scr);
+ Esnprintf(s, sizeof(s), "%s.groups", EGetSavePrefix());
f = fopen(s, "r");
- if (f)
+ if (!f)
+ return;
+
+ while (fgets(s, sizeof(s), f))
{
- Group *g = NULL;
+ char ss[1024];
- while (fgets(s, sizeof(s), f))
- {
- char ss[1024];
+ if (strlen(s) > 0)
+ s[strlen(s) - 1] = 0;
+ word(s, 1, ss);
- if (strlen(s) > 0)
- s[strlen(s) - 1] = 0;
- word(s, 1, ss);
- if (!strcmp(ss, "NEW:"))
- {
- g = GroupCreate();
- if (g)
- {
- word(s, 2, ss);
- g->index = atoi(ss);
- AddItem(g, NULL, g->index, LIST_TYPE_GROUP);
- }
- }
- else if (!strcmp(ss, "ICONIFY:"))
- {
- word(s, 2, ss);
- if (g)
- g->cfg.iconify = (char)atoi(ss);
- }
- else if (!strcmp(ss, "KILL:"))
- {
- word(s, 2, ss);
- if (g)
- g->cfg.kill = (char)atoi(ss);
- }
- else if (!strcmp(ss, "MOVE:"))
- {
- word(s, 2, ss);
- if (g)
- g->cfg.move = (char)atoi(ss);
- }
- else if (!strcmp(ss, "RAISE:"))
- {
- word(s, 2, ss);
- if (g)
- g->cfg.raise = (char)atoi(ss);
- }
- else if (!strcmp(ss, "SET_BORDER:"))
- {
- word(s, 2, ss);
- if (g)
- g->cfg.set_border = (char)atoi(ss);
- }
- else if (!strcmp(ss, "STICK:"))
- {
- word(s, 2, ss);
- if (g)
- g->cfg.stick = (char)atoi(ss);
- }
- else if (!strcmp(ss, "SHADE:"))
- {
- word(s, 2, ss);
- if (g)
- g->cfg.shade = (char)atoi(ss);
- }
- else if (!strcmp(ss, "MIRROR:"))
+ if (!strcmp(ss, "NEW:"))
+ {
+ g = GroupCreate();
+ if (g)
{
word(s, 2, ss);
- if (g)
- g->cfg.mirror = (char)atoi(ss);
+ g->index = atoi(ss);
+ AddItem(g, NULL, g->index, LIST_TYPE_GROUP);
}
}
- fclose(f);
+ else if (!strcmp(ss, "ICONIFY:"))
+ {
+ word(s, 2, ss);
+ if (g)
+ g->cfg.iconify = (char)atoi(ss);
+ }
+ else if (!strcmp(ss, "KILL:"))
+ {
+ word(s, 2, ss);
+ if (g)
+ g->cfg.kill = (char)atoi(ss);
+ }
+ else if (!strcmp(ss, "MOVE:"))
+ {
+ word(s, 2, ss);
+ if (g)
+ g->cfg.move = (char)atoi(ss);
+ }
+ else if (!strcmp(ss, "RAISE:"))
+ {
+ word(s, 2, ss);
+ if (g)
+ g->cfg.raise = (char)atoi(ss);
+ }
+ else if (!strcmp(ss, "SET_BORDER:"))
+ {
+ word(s, 2, ss);
+ if (g)
+ g->cfg.set_border = (char)atoi(ss);
+ }
+ else if (!strcmp(ss, "STICK:"))
+ {
+ word(s, 2, ss);
+ if (g)
+ g->cfg.stick = (char)atoi(ss);
+ }
+ else if (!strcmp(ss, "SHADE:"))
+ {
+ word(s, 2, ss);
+ if (g)
+ g->cfg.shade = (char)atoi(ss);
+ }
+ else if (!strcmp(ss, "MIRROR:"))
+ {
+ word(s, 2, ss);
+ if (g)
+ g->cfg.mirror = (char)atoi(ss);
+ }
}
+ fclose(f);
}
#define GROUP_OP_ADD 1
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/session.c,v
retrieving revision 1.75.2.18
retrieving revision 1.75.2.19
diff -u -3 -r1.75.2.18 -r1.75.2.19
--- session.c 24 Dec 2004 14:03:55 -0000 1.75.2.18
+++ session.c 28 Dec 2004 18:59:56 -0000 1.75.2.19
@@ -50,6 +50,8 @@
* recieved the new sm_file value from the master_pid process */
static int stale_sm_file = 0;
+#if 0 /* Unused */
+
/* The saved window details */
static int num_match = 0;
@@ -290,6 +292,7 @@
}
}
}
+#endif /* Unused */
void
autosave(void)
@@ -593,7 +596,10 @@
* }
*/
}
+
+#if 0 /* Unused */
SaveWindowStates();
+#endif
SmcRequestSaveYourselfPhase2(smc_conn, callback_save_yourself2, NULL);
client_data = NULL;
save_style = 0;
@@ -722,7 +728,9 @@
stale_sm_file = 1;
#endif /* HAVE_X11_SM_SMLIB_H */
+#if 0 /* Unused */
LoadWindowStates();
+#endif
}
void
@@ -859,7 +867,9 @@
if (params)
sscanf(params, "%1000s %1000s", s, s2);
+#if 0 /* Unused */
SaveWindowStates();
+#endif
if (!params)
SessionSave(1);
ICCCM_SetEInfoOnAll();
-------------------------------------------------------
SF email is sponsored by - The IT Product Guide
Read honest & candid reviews on hundreds of IT Products from real users.
Discover which products truly live up to the hype. Start reading now.
http://productguide.itmanagersjournal.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
