Update of /cvsroot/netrek/client/netrekxp/src
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv21338/src
Modified Files:
data.c defaults.c option.c
Log Message:
Backend for new options clickDelay (controls continous mouse repeat
rate) and packetLights (show packets via 2 blinking dots on dash).
Taken from TedTurner client.
Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- defaults.c 21 Mar 2007 23:59:50 -0000 1.63
+++ defaults.c 25 Mar 2007 23:44:37 -0000 1.64
@@ -95,6 +95,14 @@
NULL
}
},
+#ifdef MOTION_MOUSE
+ {"clickDelay", &clickDelay, RC_INT,
+ {
+ "Delay before continuous mouse clicks, in updates (0 = no delay)",
+ NULL
+ }
+ },
+#endif
{"colorClient", &colorClient, RC_INT,
{
"What type of ship bitmaps to use",
@@ -382,6 +390,12 @@
NULL
}
},
+ {"packetLights", &packetLights, RC_BOOL,
+ {
+ "Show packets sent and received by blinking dashboard lights",
+ NULL
+ }
+ },
{"partitionPlist", &partitionPlist, RC_BOOL,
{
"Add space between teams in player list",
@@ -1637,7 +1651,8 @@
tractorID = booleanDefault ("tractorID", tractorID);
lockLine = booleanDefault ("lockLine", lockLine);
weaponsOnMap = booleanDefault ("weaponsOnMap", weaponsOnMap);
- sortPlanets = booleanDefault ("sortPlanets", sortPlanets);
+ sortPlanets = booleanDefault ("sortPlanets", sortPlanets);
+ packetLights = booleanDefault ("packetLights", packetLights);
tpDotDist = intDefault ("tpDotDist", tpDotDist);
omitTeamLetter = booleanDefault ("omitTeamLetter", omitTeamLetter);
beepOnPrivateMessage = booleanDefault ("beepOnPrivateMessage", beepOnPrivateMessage);
@@ -1797,6 +1812,7 @@
continuousMouseFix = booleanDefault ("continuousMouseFix", continuousMouseFix);
motionThresh = intDefault ("motionThresh", motionThresh);
+ clickDelay = intDefault ("clickDelay", clickDelay);
#endif
#ifdef SHIFTED_MOUSE
Index: option.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/option.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- option.c 21 Mar 2007 23:59:50 -0000 1.41
+++ option.c 25 Mar 2007 23:44:37 -0000 1.42
@@ -246,6 +246,10 @@
struct int_range messagehud_range = { 0, 2, 1 };
#endif
+#ifdef MOTION_MOUSE
+struct int_range clickdelay_range = { 0, 50, 1 };
+#endif
+
struct int_range playerlistobserver_range = { 0, 4, 1 };
struct int_range planetbitmaprange = { 0, 3, 1 };
@@ -329,6 +333,7 @@
#ifdef MOTION_MOUSE
{1, "use continuous mouse", &continuousMouse, 0, 0, 0, NULL, NULL},
{1, "fix continuous mouse", &continuousMouseFix, 0, 0, 0, NULL, NULL},
+ {1, "%d updates repeat delay", &clickDelay, 0, 0, 0, NULL, &clickdelay_range},
#endif
{1, "allow wheel actions", &allowWheelActions, 0, 0, 0, NULL, NULL},
{1, "new keymap entries: %s", 0, 0, newkeys, 13, NULL, NULL},
@@ -399,6 +404,7 @@
{0, "Visuals Menu", &MenuPage, 0, 0, 0, NULL, &Menus_Range},
{1, "Page %d (click to change)", &MenuPage, 0, 0, 0, NULL, &Menus_Range},
{1, "", &newDashboard, 0, 0, 0, dashboardoptions, NULL},
+ {1, "show packet lights", &packetLights, 0, 0, 0, NULL, NULL},
{1, "", &timerType, 0, 0, 0, timermess, NULL},
{1, "keep info on for %d x .1s (0=perm)", &keepInfo, 0, 0, 0, 0, &keepInfo_range},
#ifdef BEEPLITE
Index: data.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/data.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- data.c 21 Mar 2007 23:59:50 -0000 1.71
+++ data.c 25 Mar 2007 23:44:37 -0000 1.72
@@ -581,6 +581,7 @@
int continuousMouse = 1;
int continuousMouseFix = 1;
int motionThresh = 16;
+int clickDelay = 0; /* # of updates to delay before repeating */
int motion_mouse_enablable = 1;
int motion_mouse_steering = 0;
@@ -818,3 +819,4 @@
int lockLine = 1; /* draw dashed line on map from you to lock target */
int weaponsOnMap = 1; /* draw weapons fire on map */
int sortPlanets = 1; /* sort planet list by team and army count */
+int packetLights = 1; /* show packet send/receive via dashboard */
\ No newline at end of file