Moved ngmx to C++, renamed it to view.

[alexxy/gromacs.git] / src / programs / view / x11.h

diff --git a/src/ngmx/x11.h b/src/programs/view/x11.h
similarity index 95%
rename from src/ngmx/x11.h
rename to src/programs/view/x11.h
index b30c6470834e9d5f09649ea688f2a1d2c913992a..2d7cf04928b3f429b5e60a17dcaabef180ca3cda 100644 (file)
--- a/src/ngmx/x11.h
+++ b/src/programs/view/x11.h
@@ -47,12 +47,8 @@ extern unsigned long BLACK, BLUE, GREEN, CYAN, RED, BROWN, GREY, DARKGREY;
 extern unsigned long LIGHTBLUE, LIGHTGREY, LIGHTGREEN, LIGHTCYAN,
                      LIGHTRED, VIOLET, YELLOW, WHITE;
 
-typedef enum {
-    ecbOK
-} ecbReturn;
-
 #define CBARGS (struct t_x11 *x11, XEvent *event, Window w, void *data)
-/* Callback function. Return FALSE to continue, TRUE to exit */
+/* Callback function. Return false to continue, true to exit */
 
 typedef struct t_x11 {
     Display            *disp;
@@ -69,7 +65,7 @@ typedef struct t_x11 {
     void        (*GetNamedColor)(struct t_x11 *x11, const char *name, unsigned long *col);
     void        (*MainLoop)(struct t_x11 *x11);
     void        (*RegisterCallback)(struct t_x11 *x11, Window w, Window Parent,
-                                    gmx_bool cb CBARGS, void *data);
+                                    bool cb CBARGS, void *data);
     void        (*UnRegisterCallback)(struct t_x11 *x11, Window w);
     void        (*SetInputMask)(struct t_x11 *x11, Window w, unsigned long mask);
     unsigned long       (*GetInputMask)(struct t_x11 *x11, Window w);
@@ -77,7 +73,7 @@ typedef struct t_x11 {
     void        (*Flush)(struct t_x11 *x11);
 } t_x11;
 
-typedef gmx_bool CallBack CBARGS;
+typedef bool CallBack CBARGS;
 
 typedef struct t_wlist {
     Window                 w;      /* The window itself                        */
@@ -126,7 +122,7 @@ t_x11 *GetX11(int *argc, char *argv[]);
  *    events. It is up to the window to destroy itself. The MainLoop
  *    routine exits when there are no more windows to manage, i.e. when
  *    all routines have called UnRegisterCallback, OR when one Callback
- *    routine returns non-zero (TRUE).
+ *    routine returns non-zero (true).
  * 5. Call x11->CleanUp. This closes the display, and frees all
  *    memory allocated by x11 before.
  */