Commit 52cefdd7 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel

Display.c: reformat some comments

parent 141d6bea
...@@ -1088,7 +1088,6 @@ void nxagentResetSignalHandlers(void) ...@@ -1088,7 +1088,6 @@ void nxagentResetSignalHandlers(void)
*/ */
nxagentInitTimer(); nxagentInitTimer();
} }
void nxagentOpenDisplay(int argc, char *argv[]) void nxagentOpenDisplay(int argc, char *argv[])
...@@ -1899,14 +1898,15 @@ static int nxagentCheckForDefaultDepthCompatibility(void) ...@@ -1899,14 +1898,15 @@ static int nxagentCheckForDefaultDepthCompatibility(void)
/* /*
* Depending on the (reconnect) tolerance checks value, this * Depending on the (reconnect) tolerance checks value, this
* function checks stricter or looser: * function checks stricter or looser:
* - Strict means that the old and new default depth values must * - "Strict" means that the old and new default depth values
* match exactly. * must match exactly.
* - Safe or Risky means that the default depth values might * - "Safe" or "Risky" means that the default depth values might differ,
* differ, but the new default depth value must be at least as * but the new default depth value must be at least as
* high as the former default depth value. This is recommended, * high as the former default depth value. This is
* because it allows clients with a higher default depth value * recommended, because it allows clients with a
* to still connect, but not lose functionality. * higher default depth value to still connect, but
* - Bypass means that all of these checks are essentially * not lose functionality.
* - "Bypass" means that all of these checks are essentially
* deactivated. This is probably a very bad idea. * deactivated. This is probably a very bad idea.
*/ */
...@@ -1958,17 +1958,19 @@ static int nxagentCheckForDepthsCompatibility(void) ...@@ -1958,17 +1958,19 @@ static int nxagentCheckForDepthsCompatibility(void)
/* /*
* Depending on the (reconnect) tolerance checks value, this * Depending on the (reconnect) tolerance checks value, this
* function checks stricter or looser: * function checks stricter or looser:
* - Strict means that the number of old and new depths must match * - "Strict" means that the number of old and new depths must
* exactly and every old depth value must be available in the * match exactly and every old depth value must be
* new depth array. * available in the new depth array.
* - Safe means that the number of depths might diverge, but all * - "Safe" means that the number of depths might diverge,
* former depth must also be included in the new depth * but all former depth must also be included in the
* array. This is recommended, because it allows clients with * new depth array. This is recommended, because
* more depths to still connect, but not lose functionality. * it allows clients with more depths to still
* - Risky means that the new depths array is allowed to be * connect, but not lose functionality.
* smaller than the old depths array, but at least one depth * - "Risky" means that the new depths array is allowed to be
* value must be included in both. This is potentially unsafe. * smaller than the old depths array, but at least
* - Bypass or higher means that all of these checks are * one depth value must be included in both.
* This is potentially unsafe.
* - "Bypass" or higher means that all of these checks are
* essentially deactivated. This is a very bad idea. * essentially deactivated. This is a very bad idea.
*/ */
...@@ -2009,12 +2011,12 @@ static int nxagentCheckForDepthsCompatibility(void) ...@@ -2009,12 +2011,12 @@ static int nxagentCheckForDepthsCompatibility(void)
/* /*
* By now the tolerance is either: * By now the tolerance is either:
* - Strict and both depth numbers match * - "Strict" and both depth numbers match
* - Safe and: * - "Safe" and:
* o the number of old and new depths matches exactly, or * o the number of old and new depths matches exactly, or
* o the number of old depths is lower than the number * o the number of old depths is lower than the number
* of new depths * of new depths
* - Risky * - "Risky"
*/ */
bool compatible = true; bool compatible = true;
...@@ -2110,19 +2112,21 @@ static int nxagentCheckForPixmapFormatsCompatibility(void) ...@@ -2110,19 +2112,21 @@ static int nxagentCheckForPixmapFormatsCompatibility(void)
/* /*
* Depending on the (reconnect) tolerance checks value, this * Depending on the (reconnect) tolerance checks value, this
* function checks stricter or looser: * function checks stricter or looser:
* - Strict means that the number of internal and external pixmap * - "Strict" means that the number of internal and external
* formats must match exactly and every internal pixmap format * pixmap formats must match exactly and every
* must be available in the external pixmap format array. * internal pixmap format must be available in the
* - Safe means that the number of pixmap formats might diverge, * external pixmap format array.
* but all internal pixmap formats must also be included in the * - "Safe" means that the number of pixmap formats might
* external pixmap formats array. This is recommended, because * diverge, but all internal pixmap formats must
* it allows clients with more pixmap formats to still connect, * also be included in the external pixmap formats
* array. This is recommended, because it allows
* clients with more pixmap formats to still connect,
* but not lose functionality. * but not lose functionality.
* - Risky means that the internal pixmap formats array is allowed * - "Risky" means that the internal pixmap formats array is
* to be smaller than the external pixmap formats array, but at * allowed to be smaller than the external pixmap
* least one pixmap format must be included in both. This is * formats array, but at least one pixmap format must
* potentially unsafe. * be included in both. This is potentially unsafe.
* - Bypass or higher means that all of these checks are * - "Bypass" or higher means that all of these checks are
* essentially deactivated. This is a very bad idea. * essentially deactivated. This is a very bad idea.
*/ */
...@@ -2161,13 +2165,13 @@ static int nxagentCheckForPixmapFormatsCompatibility(void) ...@@ -2161,13 +2165,13 @@ static int nxagentCheckForPixmapFormatsCompatibility(void)
/* /*
* By now the tolerance is either: * By now the tolerance is either:
* - Strict * - "Strict"
* - Safe and: * - "Safe" and:
* o the number of internal and external pixmap formats * o the number of internal and external pixmap formats
* matches exactly, or * matches exactly, or
* o the number of external pixmap formats is higher than * o the number of external pixmap formats is higher than
* the number of internal pixmap formats, * the number of internal pixmap formats,
* - Risky * - "Risky"
*/ */
bool compatible = true; bool compatible = true;
...@@ -2592,7 +2596,7 @@ Bool nxagentReconnectDisplay(void *p0) ...@@ -2592,7 +2596,7 @@ Bool nxagentReconnectDisplay(void *p0)
useXpmIcon = nxagentMakeIcon(nxagentDisplay, &nxagentIconPixmap, &nxagentIconShape); useXpmIcon = nxagentMakeIcon(nxagentDisplay, &nxagentIconPixmap, &nxagentIconShape);
/* /*
* All went fine. We can continue handling our clients. * Everything went fine. We can continue handling our clients.
*/ */
reconnectDisplayState = EVERYTHING_DONE; reconnectDisplayState = EVERYTHING_DONE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment