snow/dockapps
1
0
Fork 0
Code Issues Releases Activity

Fix two bugs related to command execution:

Browse source 
- When executing a command, control flow would fall through to the
  display cycle code, changing the display.

- When display cycling was prevented by the user (via -l), command
  execution was also disabled.
This commit is contained in:
Len Trigg 2013-12-05 13:11:59 +13:00 committed by Carlos R. Mafra
parent 2ca71dc449
commit 145662ff35
1 changed files with 21 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
wmmon/wmmon/wmmon.c
View file

@ -522,7 +522,7 @@ void wmmon_routine(int argc, char **argv)
break; break;
case ButtonRelease: case ButtonRelease:
i = CheckMouseRegion(Event.xbutton.x, Event.xbutton.y); i = CheckMouseRegion(Event.xbutton.x, Event.xbutton.y);
if (but_stat == i && but_stat >= 0 && mode_cycling) { if (but_stat == i && but_stat >= 0) {
switch (but_stat) { switch (but_stat) {
case 0: case 0:
switch (Event.xbutton.button) { switch (Event.xbutton.button) {
@ -539,28 +539,31 @@ void wmmon_routine(int argc, char **argv)
execCommand(right_action); execCommand(right_action);
break; break;
} }
break;
case 1: case 1:
stat_current++; if (mode_cycling) {
if (stat_current == stat_online) stat_current++;
stat_current = 0; if (stat_current == stat_online)
stat_current = 0;
DrawActive(stat_device[stat_current].name); DrawActive(stat_device[stat_current].name);
if (stat_current == 0) if (stat_current == 0)
DrawStats(stat_device[stat_current].his, DrawStats(stat_device[stat_current].his,
HISTORY_ENTRIES-1, 40, 5, 58); HISTORY_ENTRIES-1, 40, 5, 58);
if (stat_current == 1) if (stat_current == 1)
DrawStats_io(stat_device[stat_current].his, DrawStats_io(stat_device[stat_current].his,
HISTORY_ENTRIES-1, 40, 5, 58); HISTORY_ENTRIES-1, 40, 5, 58);
if (stat_current == 2) { if (stat_current == 2) {
xpm_X = 64; xpm_X = 64;
setMaskXY(-64, 0); setMaskXY(-64, 0);
} else { } else {
xpm_X = 0; xpm_X = 0;
setMaskXY(0, 0); setMaskXY(0, 0);
}
RedrawWindowXY(xpm_X, xpm_Y);
} }
RedrawWindowXY(xpm_X, xpm_Y);
break; break;
} }
} }