X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Fdemo-Xm-widgets.c;h=09199d9f06d58744938673fa7864a72273b2fa41;hb=a94197e76a5dea5cb60542840809d6c20d0abbf3;hp=63c3d9b0aea71a4f4a0e3f4a868db374bdce49a9;hpb=14463b6ad1ab1ccf81f9c33350b048e410ba94cb;p=xscreensaver

diff --git a/driver/demo-Xm-widgets.c b/driver/demo-Xm-widgets.c
index 63c3d9b0..09199d9f 100644
--- a/driver/demo-Xm-widgets.c
+++ b/driver/demo-Xm-widgets.c
@@ -33,15 +33,21 @@
 #include <Xm/TextF.h>
 #include <Xm/ToggleBG.h>
 #include <Xm/CascadeBG.h>
-#ifdef HAVE_XMCOMBOBOX
-# include <Xm/ComboBox.h>
-#endif
 #include <Xm/RowColumn.h>
 #include <Xm/LabelG.h>
 #include <Xm/SeparatoG.h>
 #include <Xm/SelectioB.h>
 
+#ifdef HAVE_XMCOMBOBOX		/* a Motif 2.0 widget */
+# include <Xm/ComboBox.h>
+# ifndef XmNtextField		/* Lesstif 0.89.4 bug */
+#  undef HAVE_XMCOMBOBOX
+# endif
+#endif /* HAVE_XMCOMBOBOX */
+
 #include <stdio.h>
+#include <stdlib.h>
+
 
 
 const char *visual_menu[] = {
@@ -452,6 +458,111 @@ create_demos_page (Widget parent)
 static Widget
 create_options_page (Widget parent)
 {
+  /* This is what the layout is today:
+
+     Form (horizontal)
+       Label ("Saver Timeout")
+       Label ("Cycle Timeout")
+       Label ("Fade Duration")
+       Label ("Fade Ticks")
+       Label ("Lock Timeout")
+       Label ("Password Timeout")
+
+       Text (timeout)
+       Text (cycle)
+       Text (fade seconds)
+       Text (fade ticks)
+       Text (lock)
+       Text (passwd)
+
+       Toggle ("Verbose")
+       Toggle ("Install Colormap")
+       Toggle ("Fade Colormap")
+       Toggle ("Unfade Colormap")
+       Toggle ("Require Password")
+
+       HR
+       Button ("OK")
+       Button ("Cancel")
+   */
+
+  /* This is what it should be:
+
+     Form (horizontal)
+       Form (vertical) ("column1")
+         Frame
+           Label ("Blanking and Locking")
+           Form
+             Label ("Blank After")
+             Label ("Cycle After")
+             Text ("Blank After")
+             Text ("Cycle After")
+             HR
+             Checkbox ("Require Password")
+             Label ("Lock After")
+             Text ("Lock After")
+         Frame
+           Label ("Image Manipulation")
+           Form
+             Checkbox ("Grab Desktop Images")
+             Checkbox ("Grab Video Frames")
+             Checkbox ("Choose Random Image")
+             Text (pathname)
+             Button ("Browse")
+         Frame
+           Label ("Diagnostics")
+           Form
+             Checkbox ("Verbose Diagnostics")
+             Checkbox ("Display Subprocess Errors")
+             Checkbox ("Display Splash Screen at Startup")
+       Form (vertical) ("column2")
+         Frame
+           Label ("Display Power Management")
+           Form
+             Checkbox ("Power Management Enabled")
+             Label ("Standby After")
+             Label ("Suspend After")
+             Label ("Off After")
+             Text ("Standby After")
+             Text ("Suspend After")
+             Text ("Off After")
+         Frame
+           Label ("Colormaps")
+           Form
+             Checkbox ("Install Colormap")
+             HR
+             Checkbox ("Fade To Black When Blanking")
+             Checkbox ("Fade From Black When Unblanking")
+             Label ("Fade Duration")
+             Text ("Fade Duration")
+
+       timeoutLabel
+       cycleLabel
+       fadeSecondsLabel
+       fadeTicksLabel
+       lockLabel
+       passwdLabel
+
+       timeoutText
+       cycleText
+       fadeSecondsText
+       fadeTicksText
+       lockText
+       passwdText
+
+       verboseToggle
+       cmapToggle
+       fadeToggle
+       unfadeToggle
+       lockToggle
+
+       separator
+       OK
+       Cancel
+   */
+
+
+
   Arg av[64];
   int ac = 0;
   Widget children[100];
@@ -504,9 +615,9 @@ create_options_page (Widget parent)
   fade_text = XmCreateTextField (preferences_form, "fadeSecondsText", av, ac);
   fade_ticks_text = XmCreateTextField (preferences_form, "fadeTicksText",
                                        av, ac);
-  lock_timeout_text = XmCreateTextField (preferences_form, "passwdText",
+  lock_timeout_text = XmCreateTextField (preferences_form, "lockText",
                                          av, ac);
-  passwd_timeout_text = XmCreateTextField (preferences_form, "lockText",
+  passwd_timeout_text = XmCreateTextField (preferences_form, "passwdText",
                                            av, ac);
   XtSetArg(av[ac], XmNalignment, XmALIGNMENT_BEGINNING); ac++;
   verbose_toggle = XmCreateToggleButtonGadget (preferences_form,