Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h actions.c comms.c conf.h config.c desktops.c file.c
settings.c setup.c
Log Message:
Move around some desktop and background configuration items.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -3 -r1.204 -r1.205
--- E.h 11 Feb 2004 15:27:41 -0000 1.204
+++ E.h 11 Feb 2004 15:39:12 -0000 1.205
@@ -347,11 +347,6 @@
#define SPANS_COMMON(x1, w1, x2, w2) \
(!((((x2) + (w2)) <= (x1)) || ((x2) >= ((x1) + (w1)))))
-#define ENLIGHTENMENT_CONF_NUM_DESKTOPS 32
-/* the cast is so -1 will == UINT_MAX */
-#define DESKTOPS_WRAP_NUM(x) \
- (((unsigned int) (x)) % conf.desks.num)
-
#define LIST_FINDBY_NAME 0
#define LIST_FINDBY_ID 1
#define LIST_FINDBY_BOTH 2
@@ -1101,10 +1096,16 @@
}
Desk;
+#define ENLIGHTENMENT_CONF_NUM_DESKTOPS 32
+/* the cast is so -1 will == UINT_MAX */
+#define DESKTOPS_WRAP_NUM(x) \
+ (((unsigned int) (x)) % conf.desks.num)
+
typedef struct _desktops
{
int current;
Desk desk[ENLIGHTENMENT_CONF_NUM_DESKTOPS];
+ int order[ENLIGHTENMENT_CONF_NUM_DESKTOPS];
}
Desktops;
@@ -1143,6 +1144,12 @@
} autoraise;
struct
{
+ char hiquality;
+ char user;
+ int timeout;
+ } backgrounds;
+ struct
+ {
int num;
char wraparound;
int dragdir;
@@ -1151,7 +1158,6 @@
int dragbar_length;
char slidein;
int slidespeed;
- char hiqualitybg;
} desks;
struct
{
@@ -1224,7 +1230,6 @@
int slidespeedcleanup;
char animate_shading;
int shadespeed;
- int desktop_bg_timeout;
char sound;
int button_move_resistance;
char autosave;
@@ -1237,9 +1242,9 @@
char manual_placement_mouse_pointer;
char warpmenus;
int edge_flip_resistance;
- char user_bg;
GroupConfig group_config;
char group_swapmove;
+ int theme_transparency;
/* Not used */
char primaryicondir;
@@ -2723,7 +2728,6 @@
extern Window init_win1;
extern Window init_win2;
extern Window init_win_ext;
-extern int deskorder[ENLIGHTENMENT_CONF_NUM_DESKTOPS];
#define FILEPATH_LEN_MAX 4096
extern char themepath[FILEPATH_LEN_MAX];
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/actions.c,v
retrieving revision 1.138
retrieving revision 1.139
diff -u -3 -r1.138 -r1.139
--- actions.c 8 Feb 2004 22:51:50 -0000 1.138
+++ actions.c 11 Feb 2004 15:39:12 -0000 1.139
@@ -1870,7 +1870,7 @@
{
EDBUG(6, "doDesktopBgTimeoutSet");
if (params)
- conf.desktop_bg_timeout = atoi((char *)params);
+ conf.backgrounds.timeout = atoi((char *)params);
autosave();
EDBUG_RETURN(0);
}
@@ -2034,13 +2034,13 @@
{
EDBUG(6, "doHiQualityBgSet");
if (params)
- conf.desks.hiqualitybg = atoi((char *)params);
+ conf.backgrounds.hiquality = atoi((char *)params);
else
{
- if (conf.desks.hiqualitybg)
- conf.desks.hiqualitybg = 0;
+ if (conf.backgrounds.hiquality)
+ conf.backgrounds.hiquality = 0;
else
- conf.desks.hiqualitybg = 1;
+ conf.backgrounds.hiquality = 1;
}
autosave();
EDBUG_RETURN(0);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/comms.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -3 -r1.49 -r1.50
--- comms.c 11 Feb 2004 15:27:51 -0000 1.49
+++ comms.c 11 Feb 2004 15:39:12 -0000 1.50
@@ -1263,7 +1263,7 @@
else if (!strcmp(w, "DESKTOPBGTIMEOUT:"))
{
word(s, wd, w);
- conf.desktop_bg_timeout = atoi(w);
+ conf.backgrounds.timeout = atoi(w);
}
else if (!strcmp(w, "SOUND:"))
{
@@ -1375,7 +1375,7 @@
else if (!strcmp(w, "HIQUALITYBG:"))
{
word(s, wd, w);
- conf.desks.hiqualitybg = atoi(w);
+ conf.backgrounds.hiquality = atoi(w);
}
else if (!strcmp(w, "TRANSIENTSFOLLOWLEADER:"))
{
@@ -1523,7 +1523,7 @@
conf.primaryicondir, conf.movemode, conf.resizemode,
conf.slidemode, conf.cleanupslide, conf.mapslide,
conf.slidespeedmap, conf.slidespeedcleanup, conf.shadespeed,
- conf.desktop_bg_timeout, conf.sound,
+ conf.backgrounds.timeout, conf.sound,
conf.button_move_resistance, conf.autosave,
conf.memory_paranoia, conf.tooltips.enable,
conf.tooltips.delay, conf.autoraise.enable,
@@ -1532,7 +1532,7 @@
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.backgrounds.hiquality, conf.focus.transientsfollowleader,
conf.focus.switchfortransientmap, a, b,
conf.focus.all_new_windows_get_focus,
conf.focus.new_transients_get_focus,
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/conf.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -3 -r1.31 -r1.32
--- conf.h 19 Jan 2004 22:30:28 -0000 1.31
+++ conf.h 11 Feb 2004 15:39:12 -0000 1.32
@@ -141,6 +141,7 @@
#define CONTROL_DOCKAPP_SUPPORT 1370
#define CONTROL_GEOMINFOMODE 1371
#define CONTROL_GROUP_SWAPMOVE 1372
+#define CONTROL_THEME_TRANSPARENCY 1373
#define ICLASS_NAME 350
#define ICLASS_NORMAL 351
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/config.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -3 -r1.86 -r1.87
--- config.c 11 Feb 2004 15:27:51 -0000 1.86
+++ config.c 11 Feb 2004 15:39:12 -0000 1.87
@@ -761,7 +761,7 @@
conf.warplist.warpfocused = i2;
break;
case DESKTOP_HIQUALITYBG:
- conf.desks.hiqualitybg = i2;
+ conf.backgrounds.hiquality = i2;
break;
case DESKTOP_AREA_SIZE:
sscanf(s, "%i %i %i", &i1, &i2, &i3);
@@ -784,7 +784,7 @@
conf.slidespeedcleanup = i2;
break;
case CONTROL_DESKTOP_BG_TIMEOUT:
- conf.desktop_bg_timeout = i2;
+ conf.backgrounds.timeout = i2;
break;
case CONTROL_BUTTON_MOVE_RESISTANCE:
conf.button_move_resistance = i2;
@@ -808,7 +808,10 @@
conf.pagers.snap = i2;
break;
case CONTROL_USER_BG:
- conf.user_bg = i2;
+ conf.backgrounds.user = i2;
+ break;
+ case CONTROL_THEME_TRANSPARENCY:
+ conf.theme_transparency = i2;
break;
case CONTROL_DOCKSTARTPOS:
sscanf(s, "%*s %d %d ", &conf.dock.startx, &conf.dock.starty);
@@ -1783,7 +1786,8 @@
if ((atoi(s2) < ENLIGHTENMENT_CONF_NUM_DESKTOPS)
&& (atoi(s2) >= 0))
{
- if ((desks.desk[atoi(s2)].bg == NULL) || (conf.user_bg))
+ if ((desks.desk[atoi(s2)].bg == NULL) ||
+ (conf.backgrounds.user))
{
#if !USE_IMLIB2
if ((prImlib_Context) && (atoi(s2) == 0))
@@ -1816,7 +1820,8 @@
if ((atoi(s2) < ENLIGHTENMENT_CONF_NUM_DESKTOPS)
&& (atoi(s2) >= 0))
{
- if ((desks.desk[atoi(s2)].bg == NULL) || (conf.user_bg))
+ if ((desks.desk[atoi(s2)].bg == NULL) ||
+ (conf.backgrounds.user))
{
if (bg)
{
@@ -3839,7 +3844,7 @@
fprintf(autosavefile, "315 %i\n", (int)conf.mapslide);
fprintf(autosavefile, "316 %i\n", (int)conf.slidespeedmap);
fprintf(autosavefile, "317 %i\n", (int)conf.slidespeedcleanup);
- fprintf(autosavefile, "320 %i\n", (int)conf.desktop_bg_timeout);
+ fprintf(autosavefile, "320 %i\n", (int)conf.backgrounds.timeout);
fprintf(autosavefile, "321 %i\n", (int)conf.button_move_resistance);
fprintf(autosavefile, "400 %i\n", (int)conf.desks.dragdir);
fprintf(autosavefile, "401 %i\n", (int)conf.desks.dragbar_width);
@@ -3847,7 +3852,7 @@
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, "406 %i\n", (int)conf.backgrounds.hiquality);
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);
@@ -3892,7 +3897,7 @@
fprintf(autosavefile, "668 %i\n", (int)conf.warplist.warpshaded);
fprintf(autosavefile, "669 %i\n", (int)conf.warplist.warpiconified);
fprintf(autosavefile, "670 %i\n", (int)conf.warplist.warpfocused);
- fprintf(autosavefile, "1350 %i\n", (int)conf.user_bg);
+ fprintf(autosavefile, "1350 %i\n", (int)conf.backgrounds.user);
fprintf(autosavefile, "1351 %i\n", (int)conf.pagers.zoom);
fprintf(autosavefile, "1352 %i\n", (int)conf.pagers.title);
fprintf(autosavefile, "1353 %i\n",
@@ -3914,6 +3919,7 @@
fprintf(autosavefile, "1368 %i\n", (int)conf.tooltips.showroottooltip);
fprintf(autosavefile, "1369 %i %i %i\n", (int)conf.pagers.sel_button,
(int)conf.pagers.win_button, (int)conf.pagers.menu_button);
+ fprintf(autosavefile, "1373 %i\n", (int)conf.theme_transparency);
#ifdef HAS_XINERAMA
fprintf(autosavefile, "2013 %i\n", (int)conf.extra_head);
#endif
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/desktops.c,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -3 -r1.61 -r1.62
--- desktops.c 8 Feb 2004 22:51:50 -0000 1.61
+++ desktops.c 11 Feb 2004 15:39:12 -0000 1.62
@@ -237,7 +237,7 @@
i = 0;
while ((j < 0) && (i < ENLIGHTENMENT_CONF_NUM_DESKTOPS))
{
- if (deskorder[i] == num)
+ if (desks.order[i] == num)
j = i;
i++;
}
@@ -246,8 +246,8 @@
if (j > 0)
{
for (i = j - 1; i >= 0; i--)
- deskorder[i + 1] = deskorder[i];
- deskorder[0] = num;
+ desks.order[i + 1] = desks.order[i];
+ desks.order[0] = num;
}
EDBUG_RETURN_;
}
@@ -262,7 +262,7 @@
i = 0;
while ((j < 0) && (i < ENLIGHTENMENT_CONF_NUM_DESKTOPS))
{
- if (deskorder[i] == num)
+ if (desks.order[i] == num)
j = i;
i++;
}
@@ -271,8 +271,8 @@
if (j < ENLIGHTENMENT_CONF_NUM_DESKTOPS - 1)
{
for (i = j; i < ENLIGHTENMENT_CONF_NUM_DESKTOPS - 1; i++)
- deskorder[i] = deskorder[i + 1];
- deskorder[ENLIGHTENMENT_CONF_NUM_DESKTOPS - 1] = num;
+ desks.order[i] = desks.order[i + 1];
+ desks.order[ENLIGHTENMENT_CONF_NUM_DESKTOPS - 1] = num;
}
EDBUG_RETURN_;
}
@@ -550,7 +550,7 @@
gc = 0;
rt = imlib_context_get_dither();
- if (conf.desks.hiqualitybg)
+ if (conf.backgrounds.hiquality)
{
imlib_context_set_dither(1);
#if 0
@@ -644,7 +644,7 @@
/* Put image 1:1 onto the current root window */
dpmap = pmap;
}
- else if (hasbg && !hasfg && dsk->bg_tile)
+ else if (hasbg && !hasfg && dsk->bg_tile && !conf.theme_transparency)
{
/* BG only, tiled */
dpmap = ECreatePixmap(disp, win, w, h, depth);
@@ -764,7 +764,7 @@
{
d = &desks.desk[i];
d->bg = NULL;
- deskorder[i] = i;
+ desks.order[i] = i;
d->num = 0;
d->list = NULL;
d->tag = NULL;
@@ -1171,11 +1171,11 @@
for (i = 0; i < ENLIGHTENMENT_CONF_NUM_DESKTOPS; i++)
{
- if ((x >= desks.desk[deskorder[i]].x)
- && (x < (desks.desk[deskorder[i]].x + root.w))
- && (y >= desks.desk[deskorder[i]].y)
- && (y < (desks.desk[deskorder[i]].y + root.h)))
- EDBUG_RETURN(deskorder[i]);
+ if ((x >= desks.desk[desks.order[i]].x)
+ && (x < (desks.desk[desks.order[i]].x + root.w))
+ && (y >= desks.desk[desks.order[i]].y)
+ && (y < (desks.desk[desks.order[i]].y + root.h)))
+ EDBUG_RETURN(desks.order[i]);
}
EDBUG_RETURN(0);
@@ -1352,7 +1352,7 @@
i = 0;
while ((n < 0) && (i < ENLIGHTENMENT_CONF_NUM_DESKTOPS))
{
- if (deskorder[i] == num)
+ if (desks.order[i] == num)
n = i;
i++;
}
@@ -1360,10 +1360,10 @@
{
for (i = n + 1; i < ENLIGHTENMENT_CONF_NUM_DESKTOPS; i++)
{
- if ((desks.desk[deskorder[i]].viewable)
- && (desks.desk[deskorder[i]].bg))
- desks.desk[deskorder[i]].bg->last_viewed = time(NULL);
- desks.desk[deskorder[i]].viewable = 0;
+ if ((desks.desk[desks.order[i]].viewable)
+ && (desks.desk[desks.order[i]].bg))
+ desks.desk[desks.order[i]].bg->last_viewed = time(NULL);
+ desks.desk[desks.order[i]].viewable = 0;
}
}
}
@@ -1374,14 +1374,14 @@
while ((n < 0) && (i < ENLIGHTENMENT_CONF_NUM_DESKTOPS))
{
- if (deskorder[i] == num)
+ if (desks.order[i] == num)
n = i;
i++;
}
if (n >= 0)
{
- if (desks.desk[deskorder[n]].viewable)
+ if (desks.desk[desks.order[n]].viewable)
{
v = 1;
}
@@ -1393,24 +1393,24 @@
for (i = n + 1; i < ENLIGHTENMENT_CONF_NUM_DESKTOPS; i++)
{
- if ((!desks.desk[deskorder[i]].viewable) && (v))
+ if ((!desks.desk[desks.order[i]].viewable) && (v))
{
- desks.desk[deskorder[i]].viewable = v;
- RefreshDesktop(deskorder[i]);
+ desks.desk[desks.order[i]].viewable = v;
+ RefreshDesktop(desks.order[i]);
}
else
{
- if ((!v) && (desks.desk[deskorder[i]].viewable)
- && (desks.desk[deskorder[i]].bg))
+ if ((!v) && (desks.desk[desks.order[i]].viewable)
+ && (desks.desk[desks.order[i]].bg))
{
- desks.desk[deskorder[i]].bg->last_viewed =
+ desks.desk[desks.order[i]].bg->last_viewed =
time(NULL);
}
- desks.desk[deskorder[i]].viewable = v;
+ desks.desk[desks.order[i]].viewable = v;
}
- if ((desks.desk[deskorder[i]].x == 0)
- && (desks.desk[deskorder[i]].y == 0))
+ if ((desks.desk[desks.order[i]].x == 0)
+ && (desks.desk[desks.order[i]].y == 0))
{
v = 0;
}
@@ -1449,7 +1449,7 @@
EDBUG_RETURN_;
FocusNewDeskBegin();
- CloneDesktop(deskorder[0]);
+ CloneDesktop(desks.order[0]);
desks.desk[num].viewable = 1;
RefreshDesktop(num);
MoveToDeskTop(num);
@@ -1458,7 +1458,7 @@
{
for (i = ENLIGHTENMENT_CONF_NUM_DESKTOPS - 1; i > 0; i--)
{
- HideDesktop(deskorder[i]);
+ HideDesktop(desks.order[i]);
}
}
StackDesktops();
@@ -1490,16 +1490,16 @@
FocusNewDeskBegin();
CloneDesktop(num);
MoveToDeskBottom(num);
- UncoverDesktop(deskorder[0]);
+ UncoverDesktop(desks.order[0]);
HideDesktop(num);
StackDesktops();
- desks.current = deskorder[0];
+ desks.current = desks.order[0];
MoveStickyWindowsToCurrentDesk();
FocusNewDesk();
FX_DeskChange();
RemoveClones();
- RedrawPagersForDesktop(deskorder[0], 3);
- ForceUpdatePagersForDesktop(deskorder[0]);
+ RedrawPagersForDesktop(desks.order[0], 3);
+ ForceUpdatePagersForDesktop(desks.order[0]);
UpdatePagerSel();
HandleDrawQueue();
HintsSetCurrentDesktop();
@@ -1547,7 +1547,7 @@
if (num == 0)
{
for (i = ENLIGHTENMENT_CONF_NUM_DESKTOPS - 1; i > 0; i--)
- HideDesktop(deskorder[i]);
+ HideDesktop(desks.order[i]);
}
else
{
@@ -1627,10 +1627,10 @@
}
for (i = 0; i < ENLIGHTENMENT_CONF_NUM_DESKTOPS; i++)
{
- if (deskorder[i] == 0)
+ if (desks.order[i] == 0)
break;
- _APPEND_TO_WIN_LIST(desks.desk[deskorder[i]].win);
+ _APPEND_TO_WIN_LIST(desks.desk[desks.order[i]].win);
}
if (blst)
{
@@ -1945,7 +1945,7 @@
for (i = 0; i < num; i++)
{
if ((lst[i]->pmap == 0) ||
- ((now - lst[i]->last_viewed) <= conf.desktop_bg_timeout))
+ ((now - lst[i]->last_viewed) <= conf.backgrounds.timeout))
continue;
for (j = 0; j < ENLIGHTENMENT_CONF_NUM_DESKTOPS; j++)
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/file.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- file.c 11 Feb 2004 15:27:52 -0000 1.53
+++ file.c 11 Feb 2004 15:39:12 -0000 1.54
@@ -1116,7 +1116,7 @@
return 0;
}
-#if 0 /* Not used */
+#if 0 /* Not used */
void
rmrf(const char *path)
{
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/settings.c,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -3 -r1.91 -r1.92
--- settings.c 8 Feb 2004 16:39:07 -0000 1.91
+++ settings.c 11 Feb 2004 15:39:12 -0000 1.92
@@ -2466,9 +2466,9 @@
if (val < 2)
{
- conf.desktop_bg_timeout = tmp_bg_timeout;
- conf.desks.hiqualitybg = tmp_hiq;
- conf.user_bg = tmp_userbg;
+ conf.backgrounds.timeout = tmp_bg_timeout;
+ conf.backgrounds.hiquality = tmp_hiq;
+ conf.backgrounds.user = tmp_userbg;
ESetColor(&(tmp_bg->bg_solid), tmp_bg_r, tmp_bg_g, tmp_bg_b);
tmp_bg->bg_tile = tmp_bg_tile;
tmp_bg->bg.keep_aspect = tmp_bg_keep_aspect;
@@ -3305,9 +3305,9 @@
tmp_bg_yjust = 1024 - bg->bg.yjust;
tmp_bg_xperc = bg->bg.xperc;
tmp_bg_yperc = 1024 - bg->bg.yperc;
- tmp_hiq = conf.desks.hiqualitybg;
- tmp_userbg = conf.user_bg;
- tmp_bg_timeout = conf.desktop_bg_timeout;
+ tmp_hiq = conf.backgrounds.hiquality;
+ tmp_userbg = conf.backgrounds.user;
+ tmp_bg_timeout = conf.backgrounds.timeout;
d = bg_sel_dialog = DialogCreate("CONFIGURE_BG");
DialogSetTitle(d, _("Desktop Background Settings"));
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/setup.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -3 -r1.109 -r1.110
--- setup.c 10 Feb 2004 18:29:46 -0000 1.109
+++ setup.c 11 Feb 2004 15:39:13 -0000 1.110
@@ -365,6 +365,9 @@
conf.areas.wraparound = 0;
conf.autoraise.enable = 0;
conf.autoraise.delay = 0.5;
+ conf.backgrounds.hiquality = 1;
+ conf.backgrounds.user = 1;
+ conf.backgrounds.timeout = 240;
conf.desks.num = 2;
conf.desks.wraparound = 0;
conf.desks.dragdir = 2;
@@ -373,7 +376,6 @@
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;
@@ -436,7 +438,6 @@
conf.slidespeedcleanup = 8000;
conf.shadespeed = 8000;
conf.animate_shading = 1;
- conf.desktop_bg_timeout = 240;
conf.sound = 1;
conf.button_move_resistance = 5;
conf.autosave = 1;
@@ -445,7 +446,6 @@
conf.menuslide = 0;
conf.menusonscreen = 1;
conf.warpmenus = 1;
- conf.user_bg = 1;
conf.manual_placement = 0;
conf.edge_flip_resistance = 15;
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
