e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Minor changes to the configuration struct. 

SVN revision: 8808
This commit is contained in:
Kim Woelders 2004-02-04 20:32:08 +00:00
parent 8c9f368234
commit 2becc3a36d
8 changed files with 42 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/E.h
View File

@ -1144,6 +1144,11 @@ typedef struct
char wraparound;
} areas;
struct
{
char enable;
float delay;
} autoraise;
struct
{
char wraparound;
char numdesktops;
@ -1198,7 +1203,7 @@ typedef struct
{
char enable;
char showroottooltip;
double tiptime;
float delay;
} tooltips;
struct
{
@ -1224,8 +1229,6 @@ typedef struct
int button_move_resistance;
char autosave;
char memory_paranoia;
char autoraise;
double autoraisetime;
char dockapp_support; /* wmdockapp only */
char save_under;
char menuslide;

14
src/comms.c
View File

@ -1307,17 +1307,17 @@ HandleComms(XClientMessageEvent * ev)
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 @@ HandleComms(XClientMessageEvent * ev)
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,

12
src/config.c
View File

@ -686,14 +686,14 @@ Config_Control(FILE * ConfigFile)
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 @@ SaveUserControlConfig(FILE * autosavefile)
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);

2
src/evhandlers.c
View File

@ -89,7 +89,7 @@ TooltipsHandleEvent(void)
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

4
src/focus.c
View File

@ -234,12 +234,12 @@ FocusToEWin(EWin * ewin, int why)
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);
}

22
src/ipc.c
View File

@ -3396,7 +3396,7 @@ IPC_FX(char *params, Client * c)
if (conf.tooltips.enable)
{
Esnprintf(buf, sizeof(buf), "tooltips: %f seconds",
conf.tooltips.tiptime);
conf.tooltips.delay);
}
else
{
@ -3405,8 +3405,8 @@ IPC_FX(char *params, Client * c)
}
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 @@ IPC_FX(char *params, Client * c)
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 @@ IPC_FX(char *params, Client * c)
}
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"))

12
src/settings.c
View File

@ -1602,8 +1602,8 @@ CB_ConfigureAutoraise(int val, void *data)
{
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 @@ SettingsAutoRaise(void)
}
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 @@ CB_ConfigureTooltips(int val, void *data)
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 @@ SettingsTooltips(void)
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");

6
src/setup.c
View File

@ -392,6 +392,8 @@ SetupX()
* 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 @@ SetupX()
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 @@ SetupX()
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;