Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h actions.c areas.c borders.c comms.c config.c desktops.c
evhandlers.c ewmh.c finders.c gnome.c icccm.c ipc.c main.c
menus.c pager.c settings.c setup.c startup.c
Log Message:
Moved some configuration items to the configuration struct.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.195
retrieving revision 1.196
diff -u -3 -r1.195 -r1.196
--- E.h 4 Feb 2004 20:32:05 -0000 1.195
+++ E.h 6 Feb 2004 19:56:25 -0000 1.196
@@ -356,7 +356,7 @@
#define ENLIGHTENMENT_CONF_NUM_DESKTOPS 32
/* the cast is so -1 will == UINT_MAX */
#define DESKTOPS_WRAP_NUM(x) \
- (((unsigned int) (x)) % conf.desks.numdesktops)
+ (((unsigned int) (x)) % conf.desks.num)
#define LIST_FINDBY_NAME 0
#define LIST_FINDBY_ID 1
@@ -1107,13 +1107,6 @@
{
int current;
Desk desk[ENLIGHTENMENT_CONF_NUM_DESKTOPS];
- int dragdir;
- int dragbar_width;
- int dragbar_ordering;
- int dragbar_length;
- char slidein;
- int slidespeed;
- char hiqualitybg;
}
Desktops;
@@ -1141,6 +1134,8 @@
{
struct
{
+ int nx;
+ int ny;
char wraparound;
} areas;
struct
@@ -1150,8 +1145,15 @@
} autoraise;
struct
{
+ int num;
char wraparound;
- char numdesktops;
+ int dragdir;
+ int dragbar_width;
+ int dragbar_ordering;
+ int dragbar_length;
+ char slidein;
+ int slidespeed;
+ char hiqualitybg;
} desks;
struct
{
@@ -1207,7 +1209,7 @@
} tooltips;
struct
{
- signed char enable;
+ char enable;
char warpsticky;
char warpshaded;
char warpiconified;
@@ -2156,7 +2158,6 @@
int LoadConfigFile(const char *file);
int LoadEConfig(char *themelocation);
void SaveUserControlConfig(FILE * autosavefile);
-void RecoverUserConfig(void);
/* theme.c functions */
void BadThemeDialog(void);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/actions.c,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -3 -r1.136 -r1.137
--- actions.c 1 Feb 2004 11:28:05 -0000 1.136
+++ actions.c 6 Feb 2004 19:56:26 -0000 1.137
@@ -584,7 +584,7 @@
if (mode.cur_menu_depth > 0)
EDBUG_RETURN(0);
- for (i = 0; i < conf.desks.numdesktops; i++)
+ for (i = 0; i < conf.desks.num; i++)
{
if (mode.context_win == desks.desk[i].win)
{
@@ -965,7 +965,7 @@
case MODE_DESKDRAG:
dx = mode.x - mode.px;
dy = mode.y - mode.py;
- switch (desks.dragdir)
+ switch (conf.desks.dragdir)
{
case 0:
if ((desks.desk[mode.deskdrag].x + dx) < 0)
@@ -1903,16 +1903,16 @@
int i;
EDBUG(6, "doDragdirSet");
- pd = desks.dragdir;
+ pd = conf.desks.dragdir;
if (params)
- desks.dragdir = atoi((char *)params);
+ conf.desks.dragdir = atoi((char *)params);
else
{
- desks.dragdir++;
- if (desks.dragdir > 3)
- desks.dragdir = 0;
+ conf.desks.dragdir++;
+ if (conf.desks.dragdir > 3)
+ conf.desks.dragdir = 0;
}
- if (pd != desks.dragdir)
+ if (pd != conf.desks.dragdir)
{
GotoDesktop(desks.current);
for (i = 0; i < ENLIGHTENMENT_CONF_NUM_DESKTOPS; i++)
@@ -1937,16 +1937,16 @@
Button *b;
EDBUG(6, "doDragbarOrderSet");
- pd = desks.dragbar_ordering;
+ pd = conf.desks.dragbar_ordering;
if (params)
- desks.dragbar_ordering = atoi((char *)params);
+ conf.desks.dragbar_ordering = atoi((char *)params);
else
{
- desks.dragbar_ordering++;
- if (desks.dragbar_ordering > 5)
- desks.dragbar_ordering = 0;
+ conf.desks.dragbar_ordering++;
+ if (conf.desks.dragbar_ordering > 5)
+ conf.desks.dragbar_ordering = 0;
}
- if (pd != desks.dragbar_ordering)
+ if (pd != conf.desks.dragbar_ordering)
{
while ((b = RemoveItem("_DESKTOP_DRAG_CONTROL", 0,
LIST_FINDBY_NAME, LIST_TYPE_BUTTON)))
@@ -1965,10 +1965,10 @@
Button *b;
EDBUG(6, "doDragbarWidthSet");
- pd = desks.dragbar_width;
+ pd = conf.desks.dragbar_width;
if (params)
- desks.dragbar_width = atoi((char *)params);
- if (pd != desks.dragbar_width)
+ conf.desks.dragbar_width = atoi((char *)params);
+ if (pd != conf.desks.dragbar_width)
{
while ((b = RemoveItem("_DESKTOP_DRAG_CONTROL", 0,
LIST_FINDBY_NAME, LIST_TYPE_BUTTON)))
@@ -1987,10 +1987,10 @@
Button *b;
EDBUG(6, "doDragbarLengthSet");
- pd = desks.dragbar_length;
+ pd = conf.desks.dragbar_length;
if (params)
- desks.dragbar_length = atoi((char *)params);
- if (pd != desks.dragbar_length)
+ conf.desks.dragbar_length = atoi((char *)params);
+ if (pd != conf.desks.dragbar_length)
{
while ((b = RemoveItem("_DESKTOP_DRAG_CONTROL", 0,
LIST_FINDBY_NAME, LIST_TYPE_BUTTON)))
@@ -2007,13 +2007,13 @@
{
EDBUG(6, "doDeskSlideSet");
if (params)
- desks.slidein = atoi((char *)params);
+ conf.desks.slidein = atoi((char *)params);
else
{
- if (desks.slidein)
- desks.slidein = 0;
+ if (conf.desks.slidein)
+ conf.desks.slidein = 0;
else
- desks.slidein = 1;
+ conf.desks.slidein = 1;
}
autosave();
EDBUG_RETURN(0);
@@ -2024,7 +2024,7 @@
{
EDBUG(6, "doDeskSlideSpeedSet");
if (params)
- desks.slidespeed = atoi((char *)params);
+ conf.desks.slidespeed = atoi((char *)params);
autosave();
EDBUG_RETURN(0);
}
@@ -2034,13 +2034,13 @@
{
EDBUG(6, "doHiQualityBgSet");
if (params)
- desks.hiqualitybg = atoi((char *)params);
+ conf.desks.hiqualitybg = atoi((char *)params);
else
{
- if (desks.hiqualitybg)
- desks.hiqualitybg = 0;
+ if (conf.desks.hiqualitybg)
+ conf.desks.hiqualitybg = 0;
else
- desks.hiqualitybg = 1;
+ conf.desks.hiqualitybg = 1;
}
autosave();
EDBUG_RETURN(0);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/areas.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -3 -r1.59 -r1.60
--- areas.c 1 Feb 2004 11:28:05 -0000 1.59
+++ areas.c 6 Feb 2004 19:56:26 -0000 1.60
@@ -114,8 +114,8 @@
aw = 1;
if (ah < 1)
ah = 1;
- area_w = aw;
- area_h = ah;
+ conf.areas.nx = area_w = aw;
+ conf.areas.ny = area_h = ah;
HintsSetViewportConfig();
PagerReArea();
EDBUG_RETURN_;
@@ -278,7 +278,7 @@
lst = (EWin **) ListItemType(&num, LIST_TYPE_EWIN);
if (lst)
{
- if (desks.slidein)
+ if (conf.desks.slidein)
{
int wnum = 0;
Window *wl = NULL;
@@ -313,7 +313,7 @@
-(root.h *
(ay -
desks.desk[desks.current].current_area_y)),
- desks.slidespeed);
+ conf.desks.slidespeed);
Efree(wl);
}
/* move the windows to their final positions */
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/borders.c,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -3 -r1.130 -r1.131
--- borders.c 1 Feb 2004 16:48:05 -0000 1.130
+++ borders.c 6 Feb 2004 19:56:26 -0000 1.131
@@ -66,53 +66,48 @@
EDBUG(5, "DetermineEwinFloat");
- if ((ewin->desktop != 0) && (ewin->floating < 2)
- && ((desks.desk[ewin->desktop].x != 0)
- || (desks.desk[ewin->desktop].y != 0)
- || (desks.current != ewin->desktop)))
- {
- if ((desks.dragdir == 0)
- && (((ewin->x + dx < 0) || ((ewin->x + dx + ewin->w <= root.w)
- &&
- ((DesktopAt
- (desks.desk[ewin->desktop].x +
- ewin->x + dx + ewin->w - 1,
- desks.desk[ewin->desktop].y) !=
- ewin->desktop))))))
- dofloat = 1;
- if ((desks.dragdir == 1)
- && (((ewin->x + dx + ewin->w > root.w) || ((ewin->x + dx >= 0)
- &&
- ((DesktopAt
- (desks.desk
- [ewin->desktop].x +
- ewin->x + dx,
- desks.
- desk[ewin->desktop].
- y) !=
- ewin->desktop))))))
- dofloat = 1;
- if ((desks.dragdir == 2)
- &&
- (((ewin->
- y + dy < 0) || ((ewin->y + dy + ewin->h <= root.h)
- &&
- ((DesktopAt
- (desks.desk[ewin->desktop].x,
- desks.desk[ewin->desktop].y + ewin->y + dy +
- ewin->h - 1) != ewin->desktop))))))
- dofloat = 1;
- if ((desks.dragdir == 3)
- && (((ewin->y + dy + ewin->h > root.h) || ((ewin->y + dy >= 0)
- &&
- ((DesktopAt
- (desks.desk
- [ewin->desktop].x,
- desks.
- desk[ewin->desktop].y
- + ewin->y + dy) !=
- ewin->desktop))))))
- dofloat = 1;
+ if ((ewin->desktop != 0) && (ewin->floating < 2) &&
+ ((desks.desk[ewin->desktop].x != 0) ||
+ (desks.desk[ewin->desktop].y != 0) || (desks.current != ewin->desktop)))
+ {
+ switch (conf.desks.dragdir)
+ {
+ case 0:
+ if (((ewin->x + dx < 0) ||
+ ((ewin->x + dx + ewin->w <= root.w) &&
+ ((DesktopAt
+ (desks.desk[ewin->desktop].x + ewin->x + dx + ewin->w - 1,
+ desks.desk[ewin->desktop].y) != ewin->desktop)))))
+ dofloat = 1;
+ break;
+ case 1:
+ if (((ewin->x + dx + ewin->w > root.w) ||
+ ((ewin->x + dx >= 0) &&
+ ((DesktopAt
+ (desks.desk[ewin->desktop].x + ewin->x + dx,
+ desks.desk[ewin->desktop].y) != ewin->desktop)))))
+ dofloat = 1;
+ break;
+ case 2:
+ if (((ewin->y + dy < 0) ||
+ ((ewin->y + dy + ewin->h <= root.h) &&
+ ((DesktopAt
+ (desks.desk[ewin->desktop].x,
+ desks.desk[ewin->desktop].y + ewin->y + dy + ewin->h -
+ 1) != ewin->desktop)))))
+ dofloat = 1;
+ break;
+ case 3:
+ if (((ewin->y + dy + ewin->h > root.h) ||
+ ((ewin->y + dy >= 0) &&
+ ((DesktopAt
+ (desks.desk[ewin->desktop].x,
+ desks.desk[ewin->desktop].y + ewin->y + dy) !=
+ ewin->desktop)))))
+ dofloat = 1;
+ break;
+ }
+
if (dofloat)
FloatEwinAt(ewin, ewin->x + desks.desk[ewin->desktop].x,
ewin->y + desks.desk[ewin->desktop].y);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/comms.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -3 -r1.46 -r1.47
--- comms.c 4 Feb 2004 20:32:05 -0000 1.46
+++ comms.c 6 Feb 2004 19:56:26 -0000 1.47
@@ -541,7 +541,7 @@
DesktopAccounting();
desks.desk[i].viewable = view;
desks.desk[i].bg = bg;
- if (i < conf.desks.numdesktops)
+ if (i < conf.desks.num)
{
if (desks.desk[i].viewable)
RefreshDesktop(i);
@@ -581,7 +581,7 @@
DesktopAccounting();
desks.desk[i].viewable = view;
desks.desk[i].bg = NULL;
- if (i < conf.desks.numdesktops)
+ if (i < conf.desks.num)
{
if (desks.desk[i].viewable)
RefreshDesktop(i);
@@ -1337,45 +1337,45 @@
else if (!strcmp(w, "DRAGDIR:"))
{
word(s, wd, w);
- if (desks.dragdir != atoi(w))
+ if (conf.desks.dragdir != atoi(w))
dragbar_change = 1;
- desks.dragdir = atoi(w);
+ conf.desks.dragdir = atoi(w);
}
else if (!strcmp(w, "DRAGBARWIDTH:"))
{
word(s, wd, w);
- if (desks.dragbar_width != atoi(w))
+ if (conf.desks.dragbar_width != atoi(w))
dragbar_change = 1;
- desks.dragbar_width = atoi(w);
+ conf.desks.dragbar_width = atoi(w);
}
else if (!strcmp(w, "DRAGBARORDERING:"))
{
word(s, wd, w);
- if (desks.dragbar_ordering != atoi(w))
+ if (conf.desks.dragbar_ordering != atoi(w))
dragbar_change = 1;
- desks.dragbar_ordering = atoi(w);
+ conf.desks.dragbar_ordering = atoi(w);
}
else if (!strcmp(w, "DRAGBARLENGTH:"))
{
word(s, wd, w);
- if (desks.dragbar_length != atoi(w))
+ if (conf.desks.dragbar_length != atoi(w))
dragbar_change = 1;
- desks.dragbar_length = atoi(w);
+ conf.desks.dragbar_length = atoi(w);
}
else if (!strcmp(w, "DESKSLIDEIN:"))
{
word(s, wd, w);
- desks.slidein = atoi(w);
+ conf.desks.slidein = atoi(w);
}
else if (!strcmp(w, "DESKSLIDESPEED:"))
{
word(s, wd, w);
- desks.slidespeed = atoi(w);
+ conf.desks.slidespeed = atoi(w);
}
else if (!strcmp(w, "HIQUALITYBG:"))
{
word(s, wd, w);
- desks.hiqualitybg = atoi(w);
+ conf.desks.hiqualitybg = atoi(w);
}
else if (!strcmp(w, "TRANSIENTSFOLLOWLEADER:"))
{
@@ -1528,10 +1528,11 @@
conf.memory_paranoia, conf.tooltips.enable,
conf.tooltips.delay, conf.autoraise.enable,
conf.autoraise.delay, conf.dock.startx, conf.dock.starty,
- conf.save_under, conf.menuslide, conf.desks.numdesktops,
- desks.dragdir, desks.dragbar_width, desks.dragbar_ordering,
- desks.dragbar_length, desks.slidein, desks.slidespeed,
- desks.hiqualitybg, conf.focus.transientsfollowleader,
+ conf.save_under, conf.menuslide, conf.desks.num,
+ conf.desks.dragdir, conf.desks.dragbar_width,
+ conf.desks.dragbar_ordering, conf.desks.dragbar_length,
+ conf.desks.slidein, conf.desks.slidespeed,
+ conf.desks.hiqualitybg, conf.focus.transientsfollowleader,
conf.focus.switchfortransientmap, a, b,
conf.focus.all_new_windows_get_focus,
conf.focus.new_transients_get_focus,
@@ -1562,7 +1563,7 @@
buf[0] = 0;
Esnprintf(buf, sizeof(buf), "Number of desks is %d\n",
- conf.desks.numdesktops);
+ conf.desks.num);
CommsSend(c, buf);
}
else
@@ -1570,23 +1571,23 @@
int i, num;
EWin **lst;
- conf.desks.numdesktops = atoi(w);
- if (conf.desks.numdesktops <= 0)
- conf.desks.numdesktops = 1;
- else if (conf.desks.numdesktops > ENLIGHTENMENT_CONF_NUM_DESKTOPS)
- conf.desks.numdesktops = ENLIGHTENMENT_CONF_NUM_DESKTOPS;
+ conf.desks.num = atoi(w);
+ if (conf.desks.num <= 0)
+ conf.desks.num = 1;
+ else if (conf.desks.num > ENLIGHTENMENT_CONF_NUM_DESKTOPS)
+ conf.desks.num = ENLIGHTENMENT_CONF_NUM_DESKTOPS;
lst = (EWin **) ListItemType(&num, LIST_TYPE_EWIN);
if (lst)
{
for (i = 0; i < num; i++)
{
- if (lst[i]->desktop >= conf.desks.numdesktops)
- MoveEwinToDesktop(lst[i], conf.desks.numdesktops - 1);
+ if (lst[i]->desktop >= conf.desks.num)
+ MoveEwinToDesktop(lst[i], conf.desks.num - 1);
}
Efree(lst);
}
- if (desks.current >= conf.desks.numdesktops)
- GotoDesktop(conf.desks.numdesktops - 1);
+ if (desks.current >= conf.desks.num)
+ GotoDesktop(conf.desks.num - 1);
}
}
else if (!strcmp(w, "get_client_info"))
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/config.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -3 -r1.84 -r1.85
--- config.c 4 Feb 2004 20:32:05 -0000 1.84
+++ config.c 6 Feb 2004 19:56:26 -0000 1.85
@@ -36,6 +36,7 @@
static char is_autosave = 0;
static void SkipTillEnd(FILE * ConfigFile);
+static void RecoverUserConfig(void);
#define SKIP_If_EXISTS(name, type) \
if (FindItem(name, 0, LIST_FINDBY_NAME, type)) \
@@ -625,15 +626,11 @@
conf.menuslide = i2;
break;
case CONTROL_NUMDESKTOPS:
- conf.desks.numdesktops = i2;
- if (conf.desks.numdesktops <= 0)
- {
- conf.desks.numdesktops = 1;
- }
- else if (conf.desks.numdesktops > ENLIGHTENMENT_CONF_NUM_DESKTOPS)
- {
- conf.desks.numdesktops = ENLIGHTENMENT_CONF_NUM_DESKTOPS;
- }
+ conf.desks.num = i2;
+ if (conf.desks.num <= 0)
+ conf.desks.num = 1;
+ else if (conf.desks.num > ENLIGHTENMENT_CONF_NUM_DESKTOPS)
+ conf.desks.num = ENLIGHTENMENT_CONF_NUM_DESKTOPS;
break;
case CONTROL_MEMORYPARANOIA:
conf.memory_paranoia = i2;
@@ -669,8 +666,7 @@
conf.focus.raise_after_next_focus = i2;
break;
case CONTROL_DISPLAY_WARP:
- if (conf.warplist.enable >= 0)
- conf.warplist.enable = i2;
+ conf.warplist.enable = i2;
break;
case CONTROL_WARP_ON_NEXT_FOCUS:
conf.focus.warp_on_next_focus = i2;
@@ -723,22 +719,22 @@
conf.group_swapmove = i2;
break;
case DESKTOP_DRAGDIR:
- desks.dragdir = i2;
+ conf.desks.dragdir = i2;
break;
case DESKTOP_DRAGBAR_WIDTH:
- desks.dragbar_width = i2;
+ conf.desks.dragbar_width = i2;
break;
case DESKTOP_DRAGBAR_ORDERING:
- desks.dragbar_ordering = i2;
+ conf.desks.dragbar_ordering = i2;
break;
case DESKTOP_DRAGBAR_LENGTH:
- desks.dragbar_length = i2;
+ conf.desks.dragbar_length = i2;
break;
case DESKTOP_SLIDEIN:
- desks.slidein = i2;
+ conf.desks.slidein = i2;
break;
case DESKTOP_SLIDESPEED:
- desks.slidespeed = i2;
+ conf.desks.slidespeed = i2;
break;
case CONTROL_SHADESPEED:
conf.shadespeed = i2;
@@ -765,11 +761,12 @@
conf.warplist.warpfocused = i2;
break;
case DESKTOP_HIQUALITYBG:
- desks.hiqualitybg = i2;
+ conf.desks.hiqualitybg = i2;
break;
case DESKTOP_AREA_SIZE:
sscanf(s, "%i %i %i", &i1, &i2, &i3);
- SetAreaSize(i2, i3);
+ conf.areas.nx = i2;
+ conf.areas.ny = i3;
break;
case CONTROL_AREA_WRAPAROUND:
conf.areas.wraparound = i2;
@@ -3827,7 +3824,7 @@
ActionClass *ac;
Action *aa;
int i, num, flags, j;
- int a, b, r, g;
+ int b, r, g;
EDBUG(5, "SaveUserControlConfig");
if (autosavefile)
@@ -3845,13 +3842,13 @@
fprintf(autosavefile, "317 %i\n", (int)conf.slidespeedcleanup);
fprintf(autosavefile, "320 %i\n", (int)conf.desktop_bg_timeout);
fprintf(autosavefile, "321 %i\n", (int)conf.button_move_resistance);
- fprintf(autosavefile, "400 %i\n", (int)desks.dragdir);
- fprintf(autosavefile, "401 %i\n", (int)desks.dragbar_width);
- fprintf(autosavefile, "402 %i\n", (int)desks.dragbar_ordering);
- fprintf(autosavefile, "403 %i\n", (int)desks.dragbar_length);
- fprintf(autosavefile, "404 %i\n", (int)desks.slidein);
- fprintf(autosavefile, "405 %i\n", (int)desks.slidespeed);
- fprintf(autosavefile, "406 %i\n", (int)desks.hiqualitybg);
+ fprintf(autosavefile, "400 %i\n", (int)conf.desks.dragdir);
+ fprintf(autosavefile, "401 %i\n", (int)conf.desks.dragbar_width);
+ fprintf(autosavefile, "402 %i\n", (int)conf.desks.dragbar_ordering);
+ fprintf(autosavefile, "403 %i\n", (int)conf.desks.dragbar_length);
+ fprintf(autosavefile, "404 %i\n", (int)conf.desks.slidein);
+ fprintf(autosavefile, "405 %i\n", (int)conf.desks.slidespeed);
+ fprintf(autosavefile, "406 %i\n", (int)conf.desks.hiqualitybg);
fprintf(autosavefile, "1370 %i\n", (int)conf.dockapp_support);
fprintf(autosavefile, "325 %i\n", (int)conf.dock.dirmode);
fprintf(autosavefile, "326 %i\n", (int)conf.shadespeed);
@@ -3864,13 +3861,13 @@
(int)conf.dock.starty);
fprintf(autosavefile, "334 %i\n", (int)conf.memory_paranoia);
fprintf(autosavefile, "332 %i\n", (int)conf.menuslide);
- fprintf(autosavefile, "333 %i\n", (int)conf.desks.numdesktops);
+ fprintf(autosavefile, "333 %i\n", (int)conf.desks.num);
fprintf(autosavefile, "335 %i\n",
(int)conf.focus.transientsfollowleader);
fprintf(autosavefile, "336 %i\n",
(int)conf.focus.switchfortransientmap);
- GetAreaSize(&a, &b);
- fprintf(autosavefile, "407 %i %i\n", a, b);
+ fprintf(autosavefile, "407 %i %i\n", (int)conf.areas.nx,
+ (int)conf.areas.ny);
fprintf(autosavefile, "340 %i\n",
(int)conf.focus.all_new_windows_get_focus);
fprintf(autosavefile, "341 %i\n",
@@ -4216,7 +4213,7 @@
EDBUG_RETURN_;
}
-void
+static void
RecoverUserConfig(void)
{
if (is_autosave)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.c,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -3 -r1.58 -r1.59
--- desktops.c 1 Feb 2004 11:28:05 -0000 1.58
+++ desktops.c 6 Feb 2004 19:56:26 -0000 1.59
@@ -125,38 +125,38 @@
int pnum, i, num;
EWin **lst;
- pnum = conf.desks.numdesktops;
+ pnum = conf.desks.num;
for (i = quantity; i < ENLIGHTENMENT_CONF_NUM_DESKTOPS; i++)
LowerDesktop(i);
- conf.desks.numdesktops = quantity;
+ conf.desks.num = quantity;
- if (conf.desks.numdesktops <= 0)
- conf.desks.numdesktops = 1;
- else if (conf.desks.numdesktops > ENLIGHTENMENT_CONF_NUM_DESKTOPS)
- conf.desks.numdesktops = ENLIGHTENMENT_CONF_NUM_DESKTOPS;
+ if (conf.desks.num <= 0)
+ conf.desks.num = 1;
+ else if (conf.desks.num > ENLIGHTENMENT_CONF_NUM_DESKTOPS)
+ conf.desks.num = ENLIGHTENMENT_CONF_NUM_DESKTOPS;
lst = (EWin **) ListItemType(&num, LIST_TYPE_EWIN);
if (lst)
{
for (i = 0; i < num; i++)
{
- if (lst[i]->desktop >= conf.desks.numdesktops)
- MoveEwinToDesktop(lst[i], conf.desks.numdesktops - 1);
+ if (lst[i]->desktop >= conf.desks.num)
+ MoveEwinToDesktop(lst[i], conf.desks.num - 1);
}
Efree(lst);
}
- if (conf.desks.numdesktops > pnum)
+ if (conf.desks.num > pnum)
{
- for (i = pnum; i < conf.desks.numdesktops; i++)
+ for (i = pnum; i < conf.desks.num; i++)
NewPagerForDesktop(i);
}
- else if (conf.desks.numdesktops < pnum)
+ else if (conf.desks.num < pnum)
{
- for (i = conf.desks.numdesktops; i < pnum; i++)
+ for (i = conf.desks.num; i < pnum; i++)
DisablePagersForDesktop(i);
}
- if (desks.current >= conf.desks.numdesktops)
- GotoDesktop(conf.desks.numdesktops - 1);
+ if (desks.current >= conf.desks.num)
+ GotoDesktop(conf.desks.num - 1);
HintsSetDesktopConfig();
}
@@ -550,7 +550,7 @@
gc = 0;
rt = imlib_context_get_dither();
- if (desks.hiqualitybg)
+ if (conf.desks.hiqualitybg)
{
imlib_context_set_dither(1);
#if 0
@@ -898,7 +898,7 @@
}
b = NULL;
- if (desks.dragdir < 2)
+ if (conf.desks.dragdir < 2)
{
ic = FindItem("DESKTOP_DRAGBUTTON_VERT", 0, LIST_FINDBY_NAME,
LIST_TYPE_ICLASS);
@@ -927,7 +927,7 @@
LIST_TYPE_ICLASS);
}
- switch (desks.dragbar_ordering)
+ switch (conf.desks.dragbar_ordering)
{
case 0:
m = 0;
@@ -966,48 +966,48 @@
break;
}
- switch (desks.dragdir)
+ switch (conf.desks.dragdir)
{
case 0:
- w[0] = w[1] = w[2] = h[0] = h[1] = desks.dragbar_width;
- if (desks.dragbar_length == 0)
- h[2] = root.h - (desks.dragbar_width * 2);
+ w[0] = w[1] = w[2] = h[0] = h[1] = conf.desks.dragbar_width;
+ if (conf.desks.dragbar_length == 0)
+ h[2] = root.h - (conf.desks.dragbar_width * 2);
else
- h[2] = desks.dragbar_length;
+ h[2] = conf.desks.dragbar_length;
x[0] = x[1] = x[2] = 0;
y[m] = 0;
y[n] = y[m] + h[m];
y[o] = y[n] + h[n];
break;
case 1:
- w[0] = w[1] = w[2] = h[0] = h[1] = desks.dragbar_width;
- if (desks.dragbar_length == 0)
- h[2] = root.h - (desks.dragbar_width * 2);
+ w[0] = w[1] = w[2] = h[0] = h[1] = conf.desks.dragbar_width;
+ if (conf.desks.dragbar_length == 0)
+ h[2] = root.h - (conf.desks.dragbar_width * 2);
else
- h[2] = desks.dragbar_length;
- x[0] = x[1] = x[2] = root.w - desks.dragbar_width;
+ h[2] = conf.desks.dragbar_length;
+ x[0] = x[1] = x[2] = root.w - conf.desks.dragbar_width;
y[m] = 0;
y[n] = y[m] + h[m];
y[o] = y[n] + h[n];
break;
case 2:
- h[0] = h[1] = h[2] = w[0] = w[1] = desks.dragbar_width;
- if (desks.dragbar_length == 0)
- w[2] = root.w - (desks.dragbar_width * 2);
+ h[0] = h[1] = h[2] = w[0] = w[1] = conf.desks.dragbar_width;
+ if (conf.desks.dragbar_length == 0)
+ w[2] = root.w - (conf.desks.dragbar_width * 2);
else
- w[2] = desks.dragbar_length;
+ w[2] = conf.desks.dragbar_length;
y[0] = y[1] = y[2] = 0;
x[m] = 0;
x[n] = x[m] + w[m];
x[o] = x[n] + w[n];
break;
case 3:
- h[0] = h[1] = h[2] = w[0] = w[1] = desks.dragbar_width;
- if (desks.dragbar_length == 0)
- w[2] = root.w - (desks.dragbar_width * 2);
+ h[0] = h[1] = h[2] = w[0] = w[1] = conf.desks.dragbar_width;
+ if (conf.desks.dragbar_length == 0)
+ w[2] = root.w - (conf.desks.dragbar_width * 2);
else
- w[2] = desks.dragbar_length;
- y[0] = y[1] = y[2] = root.h - desks.dragbar_width;
+ w[2] = conf.desks.dragbar_length;
+ y[0] = y[1] = y[2] = root.h - conf.desks.dragbar_width;
x[m] = 0;
x[n] = x[m] + w[m];
x[o] = x[n] + w[n];
@@ -1016,7 +1016,7 @@
break;
}
- if (desks.dragbar_width > 0)
+ if (conf.desks.dragbar_width > 0)
{
b = ButtonCreate("_DESKTOP_DRAG_CONTROL", ic2, ac2, NULL, NULL, -1,
FLAG_FIXED, 1, 99999, 1, 99999, 0, 0, x[0], 0,
@@ -1033,23 +1033,23 @@
}
if (i > 0)
{
- if (desks.dragdir == 0)
+ if (conf.desks.dragdir == 0)
{
b = ButtonCreate("_DESKTOP_DESKRAY_DRAG_CONTROL", ic4, ac,
NULL, NULL, 1, FLAG_FIXED_VERT, 1, 99999, 1,
99999, 0, 0, desks.desk[i].x, 0,
desks.desk[i].y, 0, 0, 0, 0, 0, 1, 0, 1);
}
- else if (desks.dragdir == 1)
+ else if (conf.desks.dragdir == 1)
{
b = ButtonCreate("_DESKTOP_DESKRAY_DRAG_CONTROL", ic4, ac,
NULL, NULL, 1, FLAG_FIXED_VERT, 1, 99999, 1,
99999, 0, 0,
desks.desk[i].x + root.w -
- desks.dragbar_width, 0, desks.desk[i].y, 0,
- 0, 0, 0, 0, 1, 0, 1);
+ conf.desks.dragbar_width, 0, desks.desk[i].y,
+ 0, 0, 0, 0, 0, 1, 0, 1);
}
- else if (desks.dragdir == 2)
+ else if (conf.desks.dragdir == 2)
{
b = ButtonCreate("_DESKTOP_DESKRAY_DRAG_CONTROL", ic4, ac,
NULL, NULL, 1, FLAG_FIXED_HORIZ, 1, 99999, 1,
@@ -1062,7 +1062,8 @@
NULL, NULL, 1, FLAG_FIXED_HORIZ, 1, 99999, 1,
99999, 0, 0, desks.desk[i].x, 0,
desks.desk[i].y + root.h -
- desks.dragbar_width, 0, 0, 0, 0, 0, 1, 0, 1);
+ conf.desks.dragbar_width, 0, 0, 0, 0, 0, 1,
+ 0, 1);
}
AddItem(b, b->name, 2, LIST_TYPE_BUTTON);
desks.desk[i].tag = b;
@@ -1224,12 +1225,12 @@
if (conf.desks.wraparound)
{
- if (num >= conf.desks.numdesktops)
+ if (num >= conf.desks.num)
num = 0;
else if (num < 0)
- num = conf.desks.numdesktops - 1;
+ num = conf.desks.num - 1;
}
- if (num < 0 || num >= conf.desks.numdesktops || num == desks.current)
+ if (num < 0 || num >= conf.desks.num || num == desks.current)
EDBUG_RETURN_;
pdesk = desks.current;
@@ -1260,35 +1261,35 @@
if (num > 0)
{
- if (desks.slidein)
+ if (conf.desks.slidein)
{
if (!desks.desk[num].viewable)
{
- switch (desks.dragdir)
+ switch (conf.desks.dragdir)
{
case 0:
MoveDesktop(num, root.w, 0);
RaiseDesktop(num);
SlideWindowTo(desks.desk[num].win, root.w, 0, 0, 0,
- desks.slidespeed);
+ conf.desks.slidespeed);
break;
case 1:
MoveDesktop(num, -root.w, 0);
RaiseDesktop(num);
SlideWindowTo(desks.desk[num].win, -root.w, 0, 0, 0,
- desks.slidespeed);
+ conf.desks.slidespeed);
break;
case 2:
MoveDesktop(num, 0, root.h);
RaiseDesktop(num);
SlideWindowTo(desks.desk[num].win, 0, root.h, 0, 0,
- desks.slidespeed);
+ conf.desks.slidespeed);
break;
case 3:
MoveDesktop(num, 0, -root.h);
RaiseDesktop(num);
SlideWindowTo(desks.desk[num].win, 0, -root.h, 0, 0,
- desks.slidespeed);
+ conf.desks.slidespeed);
break;
default:
break;
@@ -1298,7 +1299,7 @@
{
GetWinXY(desks.desk[num].win, &x, &y);
SlideWindowTo(desks.desk[num].win, desks.desk[num].x,
- desks.desk[num].y, 0, 0, desks.slidespeed);
+ desks.desk[num].y, 0, 0, conf.desks.slidespeed);
RaiseDesktop(num);
}
StackDesktops();
@@ -1339,7 +1340,7 @@
EDBUG(3, "MoveDesktop");
if (num < 0)
EDBUG_RETURN_;
- if (num >= conf.desks.numdesktops)
+ if (num >= conf.desks.num)
EDBUG_RETURN_;
if (num == 0)
EDBUG_RETURN_;
@@ -1444,7 +1445,7 @@
EDBUG(3, "RaiseDesktop");
- if ((num < 0) || (num >= conf.desks.numdesktops))
+ if ((num < 0) || (num >= conf.desks.num))
EDBUG_RETURN_;
FocusNewDeskBegin();
@@ -1483,7 +1484,7 @@
{
EDBUG(3, "LowerDesktop");
- if ((num <= 0) || (num >= conf.desks.numdesktops))
+ if ((num <= 0) || (num >= conf.desks.num))
EDBUG_RETURN_;
FocusNewDeskBegin();
@@ -1513,7 +1514,7 @@
{
EDBUG(3, "HideDesktop");
- if ((num < 0) || (num >= conf.desks.numdesktops))
+ if ((num < 0) || (num >= conf.desks.num))
EDBUG_RETURN_;
if (num == 0)
EDBUG_RETURN_;
@@ -1536,7 +1537,7 @@
if (num < 0)
EDBUG_RETURN_;
- if (num >= conf.desks.numdesktops)
+ if (num >= conf.desks.num)
EDBUG_RETURN_;
desks.desk[num].viewable = 1;
@@ -1684,7 +1685,7 @@
EDBUG(3, "UncoverDesktop");
if (num < 0)
EDBUG_RETURN_;
- if (num >= conf.desks.numdesktops)
+ if (num >= conf.desks.num)
EDBUG_RETURN_;
desks.desk[num].viewable = 1;
RefreshDesktop(num);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/evhandlers.c,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -3 -r1.147 -r1.148
--- evhandlers.c 4 Feb 2004 20:32:06 -0000 1.147
+++ evhandlers.c 6 Feb 2004 19:56:26 -0000 1.148
@@ -67,7 +67,7 @@
int i;
int show = 1;
- for (i = 0; i < conf.desks.numdesktops; i++)
+ for (i = 0; i < conf.desks.num; i++)
{
if (win == desks.desk[i].win)
show = 0;
@@ -778,7 +778,7 @@
mode.y = ev->xbutton.y_root;
desk_click = -1;
- for (i = 0; i < conf.desks.numdesktops; i++)
+ for (i = 0; i < conf.desks.num; i++)
{
if (win == desks.desk[i].win)
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ewmh.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -3 -r1.34 -r1.35
--- ewmh.c 21 Jan 2004 23:32:44 -0000 1.34
+++ ewmh.c 6 Feb 2004 19:56:26 -0000 1.35
@@ -274,14 +274,14 @@
EDBUG(6, "EWMH_SetDesktopCount");
- val = conf.desks.numdesktops;
+ val = conf.desks.num;
_ATOM_SET_CARD32(_NET_NUMBER_OF_DESKTOPS, root.win, &val, 1);
- for (i = 0; i < conf.desks.numdesktops; i++)
+ for (i = 0; i < conf.desks.num; i++)
{
wl[i] = desks.desk[i].win;
}
- _ATOM_SET_WINDOW(_NET_VIRTUAL_ROOTS, root.win, &wl, conf.desks.numdesktops);
+ _ATOM_SET_WINDOW(_NET_VIRTUAL_ROOTS, root.win, &wl, conf.desks.num);
EDBUG_RETURN_;
}
@@ -295,7 +295,7 @@
EDBUG(6, "EWMH_SetDesktopNames");
s = buf;
- for (i = 0; i < conf.desks.numdesktops; i++)
+ for (i = 0; i < conf.desks.num; i++)
s += sprintf(s, "Desk-%d", i) + 1;
_ATOM_SET_UTF8_STRING_LIST(_NET_DESKTOP_NAMES, root.win, buf, s - buf);
@@ -325,11 +325,11 @@
EDBUG(6, "EWMH_SetWorkArea");
- n_coord = 4 * conf.desks.numdesktops;
+ n_coord = 4 * conf.desks.num;
p_coord = Emalloc(n_coord * sizeof(CARD32));
if (p_coord)
{
- for (i = 0; i < conf.desks.numdesktops; i++)
+ for (i = 0; i < conf.desks.num; i++)
{
p_coord[4 * i] = 0;
p_coord[4 * i + 1] = 0;
@@ -360,11 +360,11 @@
int n_coord, i;
EDBUG(6, "EWMH_SetDesktopViewport");
- n_coord = 2 * conf.desks.numdesktops;
+ n_coord = 2 * conf.desks.num;
p_coord = Emalloc(n_coord * sizeof(CARD32));
if (p_coord)
{
- for (i = 0; i < conf.desks.numdesktops; i++)
+ for (i = 0; i < conf.desks.num; i++)
{
p_coord[2 * i] = desks.desk[i].current_area_x * root.w;
p_coord[2 * i + 1] = desks.desk[i].current_area_y * root.h;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/finders.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -3 -r1.23 -r1.24
--- finders.c 19 Jan 2004 22:30:30 -0000 1.23
+++ finders.c 6 Feb 2004 19:56:26 -0000 1.24
@@ -172,7 +172,7 @@
EDBUG_RETURN(ewin->border->part[i].aclass);
}
- for (i = 0; i < conf.desks.numdesktops; i++)
+ for (i = 0; i < conf.desks.num; i++)
{
ActionClass *ac;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/gnome.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- gnome.c 19 Jan 2004 22:30:30 -0000 1.31
+++ gnome.c 6 Feb 2004 19:56:26 -0000 1.32
@@ -613,7 +613,7 @@
EDBUG(6, "GNOME_SetDeskCount");
if (!atom_set)
atom_set = XInternAtom(disp, XA_WIN_WORKSPACE_COUNT, False);
- val = conf.desks.numdesktops;
+ val = conf.desks.num;
XChangeProperty(disp, root.win, atom_set, XA_CARDINAL, 32, PropModeReplace,
(unsigned char *)&val, 1);
EDBUG_RETURN_;
@@ -648,17 +648,17 @@
EDBUG(6, "GNOME_SetDeskNames");
if (!atom_set)
atom_set = XInternAtom(disp, XA_WIN_WORKSPACE_NAMES, False);
- for (i = 0; i < conf.desks.numdesktops; i++)
+ for (i = 0; i < conf.desks.num; i++)
{
Esnprintf(s, sizeof(s), "%i", i);
names[i] = duplicate(s);
}
- if (XStringListToTextProperty(names, conf.desks.numdesktops, &text))
+ if (XStringListToTextProperty(names, conf.desks.num, &text))
{
XSetTextProperty(disp, root.win, &text, atom_set);
XFree(text.value);
}
- for (i = 0; i < conf.desks.numdesktops; i++)
+ for (i = 0; i < conf.desks.num; i++)
if (names[i])
Efree(names[i]);
EDBUG_RETURN_;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/icccm.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- icccm.c 1 Feb 2004 11:28:05 -0000 1.49
+++ icccm.c 6 Feb 2004 19:56:26 -0000 1.50
@@ -595,7 +595,7 @@
int dsk;
dsk = ewin->desktop;
- if ((dsk < 0) || (dsk >= conf.desks.numdesktops))
+ if ((dsk < 0) || (dsk >= conf.desks.num))
dsk = desks.current;
ewin->client.x -= desks.desk[dsk].x;
ewin->client.y -= desks.desk[dsk].y;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ipc.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -3 -r1.135 -r1.136
--- ipc.c 4 Feb 2004 20:32:06 -0000 1.135
+++ ipc.c 6 Feb 2004 19:56:26 -0000 1.136
@@ -3180,15 +3180,15 @@
word(params, 2, word2);
if (!strcmp(word2, "on"))
{
- desks.slidein = 1;
+ conf.desks.slidein = 1;
}
else if (!strcmp(word2, "off"))
{
- desks.slidein = 0;
+ conf.desks.slidein = 0;
}
else if (!strcmp(word2, "?"))
{
- if (desks.slidein)
+ if (conf.desks.slidein)
Esnprintf(buf, sizeof(buf), "deskslide: on");
else
Esnprintf(buf, sizeof(buf), "deskslide: off");
@@ -3296,51 +3296,51 @@
move = 0;
if (!strcmp(word2, "off"))
{
- desks.dragbar_width = 0;
+ conf.desks.dragbar_width = 0;
move = 1;
}
else if (!strcmp(word2, "on"))
{
- desks.dragbar_width = 16;
+ conf.desks.dragbar_width = 16;
move = 1;
}
else if (!strcmp(word2, "bottom"))
{
- desks.dragbar_width = 16;
- desks.dragdir = 3;
+ conf.desks.dragbar_width = 16;
+ conf.desks.dragdir = 3;
move = 1;
}
else if (!strcmp(word2, "right"))
{
- desks.dragbar_width = 16;
- desks.dragdir = 1;
+ conf.desks.dragbar_width = 16;
+ conf.desks.dragdir = 1;
move = 1;
}
else if (!strcmp(word2, "left"))
{
- desks.dragbar_width = 16;
- desks.dragdir = 0;
+ conf.desks.dragbar_width = 16;
+ conf.desks.dragdir = 0;
move = 1;
}
else if (!strcmp(word2, "top"))
{
- desks.dragbar_width = 16;
- desks.dragdir = 2;
+ conf.desks.dragbar_width = 16;
+ conf.desks.dragdir = 2;
move = 1;
}
else if (!strcmp(word2, "?"))
{
- if (desks.dragbar_width)
+ if (conf.desks.dragbar_width)
{
- if (desks.dragdir == 1)
+ if (conf.desks.dragdir == 1)
{
Esnprintf(buf, sizeof(buf), "Dragbar: right");
}
- else if (desks.dragdir == 2)
+ else if (conf.desks.dragdir == 2)
{
Esnprintf(buf, sizeof(buf), "Dragbar: top");
}
- else if (desks.dragdir == 3)
+ else if (conf.desks.dragdir == 3)
{
Esnprintf(buf, sizeof(buf), "Dragbar: bottom");
}
@@ -4105,8 +4105,7 @@
{
if (!strcmp(params, "?"))
{
- Esnprintf(buf, sizeof(buf), "Number of Desks: %d",
- conf.desks.numdesktops);
+ Esnprintf(buf, sizeof(buf), "Number of Desks: %d", conf.desks.num);
}
else
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/main.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -3 -r1.70 -r1.71
--- main.c 19 Jan 2004 22:30:32 -0000 1.70
+++ main.c 6 Feb 2004 19:56:26 -0000 1.71
@@ -249,6 +249,7 @@
desks.desk[0].viewable = 0;
/* now we're going to load the configuration/theme */
LoadEConfig(themepath);
+ SetAreaSize(conf.areas.nx, conf.areas.ny);
desks.desk[0].viewable = 1;
RefreshDesktop(0);
@@ -314,19 +315,19 @@
/* let's make sure we set this up and go to our desk anyways */
ICCCM_GetMainEInfo();
GotoDesktop(desks.current);
- if (desks.current < (conf.desks.numdesktops - 1))
+ if (desks.current < (conf.desks.num - 1))
{
char ps = 0;
if (!conf.mapslide)
{
- ps = desks.slidein;
- desks.slidein = 0;
+ ps = conf.desks.slidein;
+ conf.desks.slidein = 0;
}
GotoDesktop(desks.current + 1);
GotoDesktop(desks.current - 1);
if (!conf.mapslide)
- desks.slidein = ps;
+ conf.desks.slidein = ps;
}
else if (desks.current > 0)
{
@@ -334,13 +335,13 @@
if (!conf.mapslide)
{
- ps = desks.slidein;
- desks.slidein = 0;
+ ps = conf.desks.slidein;
+ conf.desks.slidein = 0;
}
GotoDesktop(desks.current - 1);
GotoDesktop(desks.current + 1);
if (!conf.mapslide)
- desks.slidein = ps;
+ conf.desks.slidein = ps;
}
XSync(disp, False);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/menus.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -3 -r1.99 -r1.100
--- menus.c 21 Jan 2004 22:14:11 -0000 1.99
+++ menus.c 6 Feb 2004 19:56:26 -0000 1.100
@@ -1838,7 +1838,7 @@
m = MenuCreate(name);
m->style = ms;
lst = (EWin **) ListItemType(&num, LIST_TYPE_EWIN);
- for (j = 0; j < conf.desks.numdesktops; j++)
+ for (j = 0; j < conf.desks.num; j++)
{
mm = MenuCreate("__SUBMENUDESK_E");
mm->style = ms;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/pager.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -3 -r1.63 -r1.64
--- pager.c 4 Feb 2004 20:17:31 -0000 1.63
+++ pager.c 6 Feb 2004 19:56:26 -0000 1.64
@@ -329,7 +329,7 @@
{
/* no snapshots ? first time ? make a row on the bottom left up */
MoveResizeEwin(ewin, 0,
- root.h - (conf.desks.numdesktops -
+ root.h - (conf.desks.num -
p->desktop) * ewin->h, ewin->client.w,
ewin->client.h);
}
@@ -827,7 +827,7 @@
{
int i;
- for (i = 0; i < conf.desks.numdesktops; i++)
+ for (i = 0; i < conf.desks.num; i++)
RedrawPagersForDesktop(i, 0);
ForceUpdatePagersForDesktop(ewin->desktop);
return;
@@ -1393,7 +1393,7 @@
if (!conf.pagers.enable)
{
conf.pagers.enable = 1;
- for (i = 0; i < conf.desks.numdesktops; i++)
+ for (i = 0; i < conf.desks.num; i++)
EnableSinglePagerForDesktop(i);
UpdatePagerSel();
}
@@ -1438,7 +1438,7 @@
if (conf.pagers.enable)
{
- for (i = 0; i < conf.desks.numdesktops; i++)
+ for (i = 0; i < conf.desks.num; i++)
DisablePagersForDesktop(i);
conf.pagers.enable = 0;
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/settings.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -3 -r1.89 -r1.90
--- settings.c 4 Feb 2004 20:32:07 -0000 1.89
+++ settings.c 6 Feb 2004 19:56:26 -0000 1.90
@@ -1116,7 +1116,7 @@
}
SoundPlay("SOUND_SETTINGS_DESKTOPS");
- tmp_desktops = conf.desks.numdesktops;
+ tmp_desktops = conf.desks.num;
tmp_desktop_wraparound = conf.desks.wraparound;
d = tmp_desk_dialog = DialogCreate("CONFIGURE_DESKTOPS");
@@ -2001,29 +2001,29 @@
conf.menusonscreen = tmp_menusonscreen;
conf.mapslide = tmp_map_slide;
conf.cleanupslide = tmp_cleanup_slide;
- desks.slidein = tmp_desktop_slide;
+ conf.desks.slidein = tmp_desktop_slide;
conf.animate_shading = tmp_animate_shading;
conf.shadespeed = tmp_shade_speed;
conf.slidemode = tmp_slide_mode;
conf.slidespeedmap = tmp_map_slide_speed;
conf.slidespeedcleanup = tmp_cleanup_slide_speed;
- desks.slidespeed = tmp_desktop_slide_speed;
+ conf.desks.slidespeed = tmp_desktop_slide_speed;
FX_Op("raindrops", tmp_effect_raindrops ? FX_OP_START : FX_OP_STOP);
FX_Op("ripples", tmp_effect_ripples ? FX_OP_START : FX_OP_STOP);
FX_Op("waves", tmp_effect_waves ? FX_OP_START : FX_OP_STOP);
- if ((desks.dragdir != tmp_dragdir) ||
- ((tmp_dragbar) && (desks.dragbar_width < 1)) ||
- ((!tmp_dragbar) && (desks.dragbar_width > 0)))
+ if ((conf.desks.dragdir != tmp_dragdir) ||
+ ((tmp_dragbar) && (conf.desks.dragbar_width < 1)) ||
+ ((!tmp_dragbar) && (conf.desks.dragbar_width > 0)))
{
Button *b;
if (tmp_dragbar)
- desks.dragbar_width = 16;
+ conf.desks.dragbar_width = 16;
else
- desks.dragbar_width = -1;
- desks.dragdir = tmp_dragdir;
+ conf.desks.dragbar_width = -1;
+ conf.desks.dragdir = tmp_dragdir;
while ((b =
RemoveItem("_DESKTOP_DRAG_CONTROL", 0, LIST_FINDBY_NAME,
LIST_TYPE_BUTTON)))
@@ -2056,18 +2056,18 @@
tmp_menusonscreen = conf.menusonscreen;
tmp_map_slide = conf.mapslide;
tmp_cleanup_slide = conf.cleanupslide;
- tmp_desktop_slide = desks.slidein;
+ tmp_desktop_slide = conf.desks.slidein;
tmp_animate_shading = conf.animate_shading;
- if (desks.dragbar_width < 1)
+ if (conf.desks.dragbar_width < 1)
tmp_dragbar = 0;
else
tmp_dragbar = 1;
- tmp_dragdir = desks.dragdir;
+ tmp_dragdir = conf.desks.dragdir;
tmp_slide_mode = conf.slidemode;
tmp_map_slide_speed = conf.slidespeedmap;
tmp_shade_speed = conf.shadespeed;
tmp_cleanup_slide_speed = conf.slidespeedcleanup;
- tmp_desktop_slide_speed = desks.slidespeed;
+ tmp_desktop_slide_speed = conf.desks.slidespeed;
tmp_effect_raindrops = FX_IsOn("raindrops");
tmp_effect_ripples = FX_IsOn("ripples");
@@ -2460,7 +2460,7 @@
if (val < 2)
{
conf.desktop_bg_timeout = tmp_bg_timeout;
- desks.hiqualitybg = tmp_hiq;
+ conf.desks.hiqualitybg = tmp_hiq;
conf.user_bg = tmp_userbg;
ESetColor(&(tmp_bg->bg_solid), tmp_bg_r, tmp_bg_g, tmp_bg_b);
tmp_bg->bg_tile = tmp_bg_tile;
@@ -3298,7 +3298,7 @@
tmp_bg_yjust = 1024 - bg->bg.yjust;
tmp_bg_xperc = bg->bg.xperc;
tmp_bg_yperc = 1024 - bg->bg.yperc;
- tmp_hiq = desks.hiqualitybg;
+ tmp_hiq = conf.desks.hiqualitybg;
tmp_userbg = conf.user_bg;
tmp_bg_timeout = conf.desktop_bg_timeout;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/setup.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -3 -r1.107 -r1.108
--- setup.c 4 Feb 2004 20:32:08 -0000 1.107
+++ setup.c 6 Feb 2004 19:56:26 -0000 1.108
@@ -391,11 +391,20 @@
/* Now we're going to set a bunch of default settings in E - in case we
* don't ever get to load a config file for some odd reason. */
memset(&conf, 0, sizeof(EConf));
+ conf.areas.nx = 2;
+ conf.areas.ny = 1;
conf.areas.wraparound = 0;
conf.autoraise.enable = 0;
conf.autoraise.delay = 0.5;
- conf.desks.numdesktops = 2;
+ conf.desks.num = 2;
conf.desks.wraparound = 0;
+ conf.desks.dragdir = 2;
+ conf.desks.dragbar_width = 16;
+ conf.desks.dragbar_ordering = 1;
+ conf.desks.dragbar_length = 0;
+ conf.desks.slidein = 1;
+ conf.desks.slidespeed = 6000;
+ conf.desks.hiqualitybg = 1;
conf.dialogs.headers = 0;
conf.dock.dirmode = DOCK_DOWN;
conf.dock.startx = 0;
@@ -471,16 +480,6 @@
conf.manual_placement = 0;
conf.edge_flip_resistance = 15;
- desks.dragdir = 2;
- desks.dragbar_width = 16;
- desks.dragbar_ordering = 1;
- desks.dragbar_length = 0;
- desks.slidein = 1;
- desks.slidespeed = 6000;
- desks.hiqualitybg = 1;
-
- SetAreaSize(2, 1);
-
ScreenInit();
MenusInit();
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/startup.c,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -3 -r1.32 -r1.33
--- startup.c 19 Jan 2004 22:30:34 -0000 1.32
+++ startup.c 6 Feb 2004 19:56:26 -0000 1.33
@@ -209,16 +209,16 @@
EMapWindow(disp, win1);
EMapWindow(disp, win2);
- b1 = ECreateWindow(w1, 0, root.h - desks.dragbar_width, root.w,
- desks.dragbar_width, 0);
- b2 = ECreateWindow(w2, 0, 0, root.w, desks.dragbar_width, 0);
+ b1 = ECreateWindow(w1, 0, root.h - conf.desks.dragbar_width, root.w,
+ conf.desks.dragbar_width, 0);
+ b2 = ECreateWindow(w2, 0, 0, root.w, conf.desks.dragbar_width, 0);
EMapRaised(disp, b1);
EMapRaised(disp, b2);
pq = queue_up;
queue_up = 0;
- IclassApply(ic, b1, root.w, desks.dragbar_width, 0, 0, 0, 0);
- IclassApply(ic, b2, root.w, desks.dragbar_width, 0, 0, 0, 0);
+ IclassApply(ic, b1, root.w, conf.desks.dragbar_width, 0, 0, 0, 0);
+ IclassApply(ic, b2, root.w, conf.desks.dragbar_width, 0, 0, 0, 0);
queue_up = pq;
SetBackgroundTo(win1, bg, 1);
SetBackgroundTo(win2, bg, 1);
-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
