Enlightenment CVS committal
Author : kwo
Project : e16
Module : e
Dir : e16/e/src
Modified Files:
E.h comms.c config.c evhandlers.c focus.c ipc.c settings.c
setup.c
Log Message:
Minor changes to the configuration struct.
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/E.h,v
retrieving revision 1.194
retrieving revision 1.195
diff -u -3 -r1.194 -r1.195
--- E.h 4 Feb 2004 20:17:30 -0000 1.194
+++ E.h 4 Feb 2004 20:32:05 -0000 1.195
@@ -1145,6 +1145,11 @@
} areas;
struct
{
+ char enable;
+ float delay;
+ } autoraise;
+ struct
+ {
char wraparound;
char numdesktops;
} desks;
@@ -1198,7 +1203,7 @@
{
char enable;
char showroottooltip;
- double tiptime;
+ float delay;
} tooltips;
struct
{
@@ -1224,8 +1229,6 @@
int button_move_resistance;
char autosave;
char memory_paranoia;
- char autoraise;
- double autoraisetime;
char dockapp_support; /* wmdockapp only */
char save_under;
char menuslide;
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/comms.c,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- comms.c 1 Feb 2004 11:28:05 -0000 1.45
+++ comms.c 4 Feb 2004 20:32:05 -0000 1.46
@@ -1307,17 +1307,17 @@
else if (!strcmp(w, "TIPTIME:"))
{
word(s, wd, w);
- conf.tooltips.tiptime = atof(w);
+ conf.tooltips.delay = atof(w);
}
else if (!strcmp(w, "AUTORAISE:"))
{
word(s, wd, w);
- conf.autoraise = atoi(w);
+ conf.autoraise.enable = atoi(w);
}
else if (!strcmp(w, "AUTORAISETIME:"))
{
word(s, wd, w);
- conf.autoraisetime = atof(w);
+ conf.autoraise.delay = atof(w);
}
else if (!strcmp(w, "DOCKSTARTX:"))
{
@@ -1526,10 +1526,10 @@
conf.desktop_bg_timeout, conf.sound,
conf.button_move_resistance, conf.autosave,
conf.memory_paranoia, conf.tooltips.enable,
- conf.tooltips.tiptime, conf.autoraise, conf.autoraisetime,
- conf.dock.startx, conf.dock.starty, conf.save_under,
- conf.menuslide, conf.desks.numdesktops, desks.dragdir,
- desks.dragbar_width, desks.dragbar_ordering,
+ 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.focus.switchfortransientmap, a, b,
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/config.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -3 -r1.83 -r1.84
--- config.c 19 Jan 2004 22:30:28 -0000 1.83
+++ config.c 4 Feb 2004 20:32:05 -0000 1.84
@@ -686,14 +686,14 @@
break;
case CONTROL_TOOLTIPTIME:
sscanf(s, "%*i %f", &f1);
- conf.tooltips.tiptime = f1;
+ conf.tooltips.delay = f1;
break;
case CONTROL_AUTORAISE:
- conf.autoraise = i2;
+ conf.autoraise.enable = i2;
break;
case CONTROL_AUTORAISETIME:
sscanf(s, "%*i %f", &f1);
- conf.autoraisetime = f1;
+ conf.autoraise.delay = f1;
break;
case CONTROL_GROUP_BORDER:
conf.group_config.set_border = i2;
@@ -3856,9 +3856,9 @@
fprintf(autosavefile, "325 %i\n", (int)conf.dock.dirmode);
fprintf(autosavefile, "326 %i\n", (int)conf.shadespeed);
fprintf(autosavefile, "327 %i\n", (int)conf.tooltips.enable);
- fprintf(autosavefile, "328 %f\n", (float)conf.tooltips.tiptime);
- fprintf(autosavefile, "338 %i\n", (int)conf.autoraise);
- fprintf(autosavefile, "339 %f\n", (float)conf.autoraisetime);
+ fprintf(autosavefile, "328 %f\n", (float)conf.tooltips.delay);
+ fprintf(autosavefile, "338 %i\n", (int)conf.autoraise.enable);
+ fprintf(autosavefile, "339 %f\n", (float)conf.autoraise.delay);
fprintf(autosavefile, "331 %i\n", (int)conf.save_under);
fprintf(autosavefile, "330 %i %i\n", (int)conf.dock.startx,
(int)conf.dock.starty);
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/evhandlers.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -3 -r1.146 -r1.147
--- evhandlers.c 2 Feb 2004 19:32:25 -0000 1.146
+++ evhandlers.c 4 Feb 2004 20:32:06 -0000 1.147
@@ -89,7 +89,7 @@
HideToolTip(ttip);
RemoveTimerEvent("TOOLTIP_TIMEOUT");
if (conf.tooltips.enable)
- DoIn("TOOLTIP_TIMEOUT", conf.tooltips.tiptime, ToolTipTimeout, 0, NULL);
+ DoIn("TOOLTIP_TIMEOUT", conf.tooltips.delay, ToolTipTimeout, 0, NULL);
}
static void
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/focus.c,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -3 -r1.44 -r1.45
--- focus.c 2 Feb 2004 19:42:35 -0000 1.44
+++ focus.c 4 Feb 2004 20:32:06 -0000 1.45
@@ -234,12 +234,12 @@
if (ewin->menu)
EDBUG_RETURN_;
- if (conf.autoraise)
+ if (conf.autoraise.enable)
{
RemoveTimerEvent("AUTORAISE_TIMEOUT");
if (conf.focus.mode != MODE_FOCUS_CLICK)
- DoIn("AUTORAISE_TIMEOUT", conf.autoraisetime, AutoraiseTimeout,
+ DoIn("AUTORAISE_TIMEOUT", conf.autoraise.delay, AutoraiseTimeout,
ewin->client.win, NULL);
}
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/ipc.c,v
retrieving revision 1.134
retrieving revision 1.135
diff -u -3 -r1.134 -r1.135
--- ipc.c 1 Feb 2004 16:49:11 -0000 1.134
+++ ipc.c 4 Feb 2004 20:32:06 -0000 1.135
@@ -3396,7 +3396,7 @@
if (conf.tooltips.enable)
{
Esnprintf(buf, sizeof(buf), "tooltips: %f seconds",
- conf.tooltips.tiptime);
+ conf.tooltips.delay);
}
else
{
@@ -3405,8 +3405,8 @@
}
else
{
- conf.tooltips.tiptime = atof(word2);
- if (!conf.tooltips.tiptime)
+ conf.tooltips.delay = atof(word2);
+ if (!conf.tooltips.delay)
conf.tooltips.enable = 0;
else
conf.tooltips.enable = 1;
@@ -3469,18 +3469,18 @@
word(params, 2, word2);
if (!strcmp(word2, "off"))
{
- conf.autoraise = 0;
+ conf.autoraise.enable = 0;
}
else if (!strcmp(word2, "on"))
{
- conf.autoraise = 1;
+ conf.autoraise.enable = 1;
}
else if (!strcmp(word2, "?"))
{
- if (conf.autoraise)
+ if (conf.autoraise.enable)
{
Esnprintf(buf, sizeof(buf), "autoraise: %f seconds",
- conf.autoraisetime);
+ conf.autoraise.delay);
}
else
{
@@ -3489,11 +3489,11 @@
}
else
{
- conf.autoraisetime = atof(word2);
- if (!conf.autoraisetime)
- conf.autoraise = 0;
+ conf.autoraise.delay = atof(word2);
+ if (!conf.autoraise.delay)
+ conf.autoraise.enable = 0;
else
- conf.autoraise = 1;
+ conf.autoraise.enable = 1;
}
}
else if (!strcmp(word1, "audio"))
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/settings.c,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -3 -r1.88 -r1.89
--- settings.c 21 Jan 2004 23:32:44 -0000 1.88
+++ settings.c 4 Feb 2004 20:32:07 -0000 1.89
@@ -1602,8 +1602,8 @@
{
if (val < 2)
{
- conf.autoraise = tmp_autoraise;
- conf.autoraisetime = ((double)tmp_autoraisetime) / 100;
+ conf.autoraise.enable = tmp_autoraise;
+ conf.autoraise.delay = ((double)tmp_autoraisetime) / 100;
}
autosave();
data = NULL;
@@ -1624,8 +1624,8 @@
}
SoundPlay("SOUND_SETTINGS_AUTORAISE");
- tmp_autoraise = conf.autoraise;
- tmp_autoraisetime = (int)(conf.autoraisetime * 100);
+ tmp_autoraise = conf.autoraise.enable;
+ tmp_autoraisetime = (int)(conf.autoraise.delay * 100);
d = DialogCreate("CONFIGURE_AUTORAISE");
DialogSetTitle(d, _("Autoraise Settings"));
@@ -1702,7 +1702,7 @@
if (val < 2)
{
conf.tooltips.enable = tmp_tooltips;
- conf.tooltips.tiptime = ((double)tmp_tooltiptime) / 100;
+ conf.tooltips.delay = ((double)tmp_tooltiptime) / 100;
conf.tooltips.showroottooltip = tmp_roottip;
}
autosave();
@@ -1725,7 +1725,7 @@
SoundPlay("SOUND_SETTINGS_TOOLTIPS");
tmp_tooltips = conf.tooltips.enable;
- tmp_tooltiptime = (int)(conf.tooltips.tiptime * 100);
+ tmp_tooltiptime = (int)(conf.tooltips.delay * 100);
tmp_roottip = conf.tooltips.showroottooltip;
d = DialogCreate("CONFIGURE_TOOLTIPS");
===================================================================
RCS file: /cvsroot/enlightenment/e16/e/src/setup.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -3 -r1.106 -r1.107
--- setup.c 28 Jan 2004 20:09:07 -0000 1.106
+++ setup.c 4 Feb 2004 20:32:08 -0000 1.107
@@ -392,6 +392,8 @@
* don't ever get to load a config file for some odd reason. */
memset(&conf, 0, sizeof(EConf));
conf.areas.wraparound = 0;
+ conf.autoraise.enable = 0;
+ conf.autoraise.delay = 0.5;
conf.desks.numdesktops = 2;
conf.desks.wraparound = 0;
conf.dialogs.headers = 0;
@@ -431,7 +433,7 @@
conf.snap.edge_snap_dist = 8;
conf.snap.screen_snap_dist = 32;
conf.tooltips.enable = 1;
- conf.tooltips.tiptime = 0.5;
+ conf.tooltips.delay = 0.5;
conf.tooltips.showroottooltip = 1;
#ifdef WITH_TARTY_WARP
conf.warplist.enable = 1;
@@ -460,8 +462,6 @@
conf.sound = 1;
conf.button_move_resistance = 5;
conf.autosave = 1;
- conf.autoraise = 0;
- conf.autoraisetime = 0.5;
conf.memory_paranoia = 1;
conf.save_under = 0;
conf.menuslide = 0;
-------------------------------------------------------
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
