Merge from trunk.

Subversion-branch: /branches/opl-branch
Subversion-revision: 1624

1 files changed, 33 insertions, 4 deletions

diff --git a/textscreen/txt_desktop.h b/textscreen/txt_desktop.h
index 40c89a48..95343977 100644
--- a/textscreen/txt_desktop.h
+++ b/textscreen/txt_desktop.h
@@ -22,18 +22,47 @@
 #ifndef TXT_DESKTOP_H
 #define TXT_DESKTOP_H
 
+/**
+ * @file txt_desktop.h
+ *
+ * Textscreen desktop.
+ */
+
 #include "txt_window.h"
 
 void TXT_AddDesktopWindow(txt_window_t *win);
 void TXT_RemoveDesktopWindow(txt_window_t *win);
-void TXT_SetDesktopTitle(char *title);
 void TXT_DrawDesktop(void);
-void TXT_GUIMainLoop(void);
 void TXT_DispatchEvents(void);
-void TXT_ExitMainLoop(void);
 void TXT_DrawWindow(txt_window_t *window, int selected);
 void TXT_WindowKeyPress(txt_window_t *window, int c);
 
-#endif /* #ifndef TXT_DESKTOP_T */
+/**
+ * Set the title displayed at the top of the screen.
+ *
+ * @param title         The title to display.
+ */
+
+void TXT_SetDesktopTitle(char *title);
+
+/**
+ * Exit the currently-running main loop and return from the
+ * @ref TXT_GUIMainLoop function.
+ */
+
+void TXT_ExitMainLoop(void);
+
+/**
+ * Start the main event loop.  At least one window must have been
+ * opened prior to running this function.  When no windows are left
+ * open, the event loop exits.
+ *
+ * It is possible to trigger an exit from this function using the
+ * @ref TXT_ExitMainLoop function.
+ */
+
+void TXT_GUIMainLoop(void);
+
+#endif /* #ifndef TXT_DESKTOP_H */