*** empty log message ***

diff --git a/clients/xregister/Register b/clients/xregister/Register
index e8d206a224d97515068b63d009a0a42ee4c8a3f2..1a29779b6fd82cf8128e64fb75debcf94df28b75 100644 (file)
--- a/clients/xregister/Register
+++ b/clients/xregister/Register
@@ -1,6 +1,14 @@
+! App resources for Register
+
+register.wcChildren:   box
 Register*Geometry:     600x500+205+90
 *.Font:                        -*-new century schoolbook-bold-r-normal--*-140-*-*-*
 
+*box.wcClassName:      form
+*box.wcChildren:       title, logo, info, fnamel, mnamel, lnamel, \
+                       idl, loginl, fnameb, mnameb, lnameb, idb, \
+                       loginb, go, again, quit
+*title.wcClassName:    label
 *title.label:          Project Athena Registration
 *title.borderWidth:    0
 *title.font:           -*-new century schoolbook-bold-r-normal--*-240-*-*-*
@@ -8,15 +16,17 @@ Register*Geometry:   600x500+205+90
 *title.horizDistance:  40
 *title.left:           ChainLeft
 *title.right:          ChainLeft
-*logo.bitmap:          /etc/athena/xdm/owl.xbm
-*logo.fromHoriz:       title
+*logo.wcClassName:     label
+*logo.bitmap:          /etc/athena/login/bitmaps/owl
+*logo.fromHoriz:       *title
 *logo.horizDistance:   30
 *logo.vertDistance:    10
 *logo.left:            ChainLeft
 *logo.right:           ChainLeft
 *logo.borderWidth:     0
 
-*info.fromVert:                logo
+*info.wcClassName:     label
+*info.fromVert:                *logo
 *info.vertDistance:    20
 *info.horizDistance:   40
 *info.width:           450
@@ -26,16 +36,18 @@ Register*Geometry:  600x500+205+90
 *info*font:            -*-new century schoolbook-medium-r-normal--*-140-*-*-*
 *info*displayCaret:    false
 
-*fnamel.fromVert:      info
+*fnamel.wcClassName:   label
+*fnamel.fromVert:      *info
 *fnamel.vertDistance:  20
 *fnamel.horizDistance: 80
 *fnamel.borderWidth:   0
 *fnamel.justify:       left
 *fnamel.label:         First Name:
 *fnamel.width:         150
-*fnameb.fromVert:      info
+*fnameb.wcClassName:   asciiText
+*fnameb.fromVert:      *info
 *fnameb.vertDistance:  20
-*fnameb.fromHoriz:     fnamel
+*fnameb.fromHoriz:     *fnamel
 *fnameb*editType:      edit
 *fnameb*type:          string
 *fnameb.width:         200
@@ -46,14 +58,16 @@ Register*Geometry:  600x500+205+90
                        Ctrl<Key>n:     AdvanceFocus()\n\
                        Ctrl<Key>p:     RetreatFocus()\n
 
-*mnamel.fromVert:      fnamel
+*mnamel.wcClassName:   label
+*mnamel.fromVert:      *fnamel
 *mnamel.horizDistance: 80
 *mnamel.borderWidth:   0
 *mnamel.justify:       left
 *mnamel.label:         Middle Name:
 *mnamel.width:         150
-*mnameb.fromVert:      fnamel
-*mnameb.fromHoriz:     mnamel
+*mnameb.wcClassName:   asciiText
+*mnameb.fromVert:      *fnamel
+*mnameb.fromHoriz:     *mnamel
 *mnameb*string:
 *mnameb*editType:      edit
 *mnameb*type:          string
@@ -63,14 +77,16 @@ Register*Geometry:  600x500+205+90
 *mnameb*useStringInPlace: true
 *mnameb*length:                80
 
-*lnamel.fromVert:      mnamel
+*lnamel.wcClassName:   label
+*lnamel.fromVert:      *mnamel
 *lnamel.horizDistance: 80
 *lnamel.borderWidth:   0
 *lnamel.justify:       left
 *lnamel.label:         Family Name:
 *lnamel.width:         150
-*lnameb.fromVert:      mnamel
-*lnameb.fromHoriz:     lnamel
+*lnameb.wcClassName:   asciiText
+*lnameb.fromVert:      *mnamel
+*lnameb.fromHoriz:     *lnamel
 *lnameb*string:
 *lnameb*editType:      edit
 *lnameb*type:          string
@@ -80,14 +96,16 @@ Register*Geometry:  600x500+205+90
 *lnameb*useStringInPlace: true
 *lnameb*length:                80
 
-*idl.fromVert:         lnamel
+*idl.wcClassName:      label
+*idl.fromVert:         *lnamel
 *idl.horizDistance:    80
 *idl.borderWidth:      0
 *idl.justify:          left
 *idl.label:            MIT ID Number:
 *idl.width:            150
-*idb.fromVert:         lnamel
-*idb.fromHoriz:                idl
+*idb.wcClassName:      asciiText
+*idb.fromVert:         *lnamel
+*idb.fromHoriz:                *idl
 *idb.editType:         edit
 *idb.width:            200
 *idb.type:             string
@@ -96,15 +114,17 @@ Register*Geometry: 600x500+205+90
 *idb*useStringInPlace: true
 *idb*length:           80
 
-*loginl.fromVert:      idl
+*loginl.wcClassName:   label
+*loginl.fromVert:      *idl
 *loginl.horizDistance: 80
 *loginl.borderWidth:   0
 *loginl.justify:       left
 *loginl.label:         Login ID:
 *loginl.width:         150
 *loginl.foreground:    white
-*loginb.fromVert:      idl
-*loginb.fromHoriz:     loginl
+*loginb.wcClassName:   asciiText
+*loginb.fromVert:      *idl
+*loginb.fromHoriz:     *loginl
 *loginb.editType:      edit
 *loginb.width:         200
 *loginb.type:          string
@@ -113,26 +133,30 @@ Register*Geometry:        600x500+205+90
 *loginb*useStringInPlace: true
 *loginb*length:                80
 
-*go.fromVert:          loginl
+*go.wcClassName:       command
+*go.fromVert:          *loginl
 *go.vertDistance:      20
 *go.horizDistance:     50
 *go.label:             OK
 *go.left:              ChainLeft
 *go.right:             ChainLeft
-*again.fromVert:       loginl
+*again.wcClassName:    command
+*again.fromVert:       *loginl
 *again.vertDistance:   20
 *again.horizDistance:  160
-*again.fromHoriz:      go
+*again.fromHoriz:      *go
 *again.label:          Start Over
 *again.left:           ChainLeft
 *again.right:          ChainLeft
-*quit.fromVert:                loginl
+*quit.wcClassName:     command
+*quit.fromVert:                *loginl
 *quit.vertDistance:    20
 *quit.horizDistance:   160
-*quit.fromHoriz:       again
+*quit.fromHoriz:       *again
 *quit.label:           Quit
 *quit.left:            ChainLeft
 *quit.right:           ChainLeft
+*quit.callback:                WcExitCB(0)
 
 
 ! Help popup:
@@ -144,4 +168,4 @@ Register*Geometry:  600x500+205+90
 *helptext.width:       500
 *helptext.height:      250
 *helpcmd.label:                Click here to remove
-*helpcmd.fromVert:     text
+*helpcmd.fromVert:     *text

diff --git a/clients/xregister/register.c b/clients/xregister/register.c
index 24f10c69eff877b0eaa9c2d11f0aa133138ec7f6..1ab38011d4a700c31db21134742ae57026c5b47d 100644 (file)
--- a/clients/xregister/register.c
+++ b/clients/xregister/register.c
@@ -3,6 +3,7 @@
 
 #include <stdio.h>
 #include <errno.h>
+#include <Wc/WcCreate.h>
 #include <X11/Intrinsic.h>
 #include <X11/Xaw/Box.h>
 #include <X11/Xaw/Command.h>
@@ -15,7 +16,7 @@
 #include <X11/Xlib.h>
 
 
-int quit(), help(), again(), go();
+int help(), again(), go();
 void advance_focus(), retreat_focus();
 char fname[128], mname[128], lname[128], iname[128], uname[128], pname[128];
 Widget TopWidget;
@@ -40,6 +41,7 @@ int argc;
 char **argv;
 {
     Widget table, w, box;
+    XtAppContext app;
     Arg args[10];
     Cardinal arg_cnt;
     Cursor cursor;
@@ -49,15 +51,12 @@ char **argv;
                             (unsigned int *)&argc, argv);
 
     XtGetApplicationResources(TopWidget, NULL, NULL, 0, NULL);
-    box = XtCreateManagedWidget("box", formWidgetClass, TopWidget, args, 0);
-    XtCreateManagedWidget("title", labelWidgetClass, box, args, 0);
-    XtCreateManagedWidget("logo", labelWidgetClass, box, args, 0);
-    XtCreateManagedWidget("info", asciiTextWidgetClass, box, args, 0);
-    XtCreateManagedWidget("fnamel", labelWidgetClass, box, args, 0);
-    XtCreateManagedWidget("mnamel", labelWidgetClass, box, args, 0);
-    XtCreateManagedWidget("lnamel", labelWidgetClass, box, args, 0);
-    XtCreateManagedWidget("idl", labelWidgetClass, box, args, 0);
-    XtCreateManagedWidget("loginl", labelWidgetClass, box, args, 0);
+    app = XtWidgetToApplicationContext(TopWidget);
+    AriRegisterAthena(app);
+    WcWidgetCreation(TopWidget);
+
+    XtRealizeWidget(TopWidget);
+    XtMainLoop();
 
     XtAddActions(field_actions, 2);
     fname[0] = 0;
@@ -85,19 +84,9 @@ char **argv;
     XtAddCallback(w, XtNcallback, go, NULL);
     w = XtCreateManagedWidget("again", commandWidgetClass, box, args, 0);
     XtAddCallback(w, XtNcallback, again, NULL);
-    w = XtCreateManagedWidget("quit", commandWidgetClass, box, args, 0);
-    XtAddCallback(w, XtNcallback, quit, NULL);
-
-    XtRealizeWidget(TopWidget);
-    XtMainLoop();
 }
 
 
-quit()
-{
-    exit(0);
-}
-
 remove_popup(ignored, w, ignored1)
 Widget ignored;
 caddr_t w;

diff --git a/gen/Imakefile b/gen/Imakefile
index 9cac341b0bf83dc5eff29686d2f9e032f53b0be5..ea40b5e755a6d18f323fb820410271d32887b335 100644 (file)
--- a/gen/Imakefile
+++ b/gen/Imakefile
@@ -12,13 +12,13 @@ SRCDIR = $(SRCTOP)/gen
 #ifdef GDSS
 SRCS = util.c moddiff.c ca.c passwd.c zephyr.c aliases.c hesiod.c \
        nfs.c mailhub.c mitdir.c prlogger.c stats.c sis.c pobox.c \
-       letter.c hosts.c
+       letter.c hosts.c report.c networks.c
 OBJS = util.o moddiff.o ca.o passwd.o zephyr.o aliases.o hesiod.o \
        nfs.o mailhub.o mitdir.o prlogger.o stats.o sis.o pobox.o \
-       letter.o hosts.o
+       letter.o hosts.o report.o networks.o
 CODE = util.c moddiff.dc ca.dc passwd.dc zephyr.dc aliases.dc hesiod.dc \
        nfs.dc mailhub.dc mitdir.dc prlogger.dc stats.dc sis.dc pobox.dc \
-       letter.dc hosts.dc
+       letter.dc hosts.dc report.dc networks.dc
 LIBS =  -L/usr/athena/lib ../lib/libmoira.a -lcom_err -lzephyr \
        ../server/libmrglue.a /mit/gdss/`machtype`/libgdss.a \
        -lkrb -ldes -lhesiod ${SQL_LIB}
@@ -26,13 +26,13 @@ DEFINES = -I/mit/gdss/include
 #else /* GDSS */
 SRCS = util.c moddiff.c ca.c passwd.c zephyr.c aliases.c hesiod.c \
        nfs.c mailhub.c mitdir.c prlogger.c stats.c pobox.c \
-       letter.c hosts.c
+       letter.c hosts.c report.c networks.c
 OBJS = util.o moddiff.o ca.o passwd.o zephyr.o aliases.o hesiod.o \
        nfs.o mailhub.o mitdir.o prlogger.o stats.o pobox.o \
-       letter.o hosts.o
+       letter.o hosts.o report.o networks.o
 CODE = util.c moddiff.dc ca.dc passwd.dc zephyr.dc aliases.dc hesiod.dc \
        nfs.dc mailhub.dc mitdir.dc prlogger.dc stats.dc pobox.dc \
-       letter.dc hosts.dc
+       letter.dc hosts.dc report.dc networks.dc
 LIBS =  -L/usr/athena/lib ../lib/libmoira.a -lcom_err -lzephyr \
        ../server/libmrglue.a -lkrb -ldes -lhesiod ${SQL_LIB}
 DEFINES =
@@ -70,3 +70,7 @@ program(letter.gen, letter.o util.o moddiff.o,${MR_LIBDEP},${LIBS},${PROGDIR})
 sqlfile(letter)
 program(hosts.gen, hosts.o util.o moddiff.o,${MR_LIBDEP},${LIBS},${PROGDIR})
 sqlfile(hosts)
+program(report.gen, report.o util.o moddiff.o,${MR_LIBDEP},${LIBS},${PROGDIR})
+sqlfile(report);
+program(networks.gen, networks.o util.o moddiff.o,${MR_LIBDEP},${LIBS},${PROGDIR})
+sqlfile(networks)