X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=driver%2Fdialogs-Xaw.c;h=5b652b11e86a9afd75001c71c4b33f73ac0d441d;hp=2487754da3739723bd71eb4027fdae923363b5c5;hb=2a991a811de4c7b22f812682b267b616a809fd9a;hpb=ce3185de9d9705e259f2b60dd4b5509007fa17d4 diff --git a/driver/dialogs-Xaw.c b/driver/dialogs-Xaw.c index 2487754d..5b652b11 100644 --- a/driver/dialogs-Xaw.c +++ b/driver/dialogs-Xaw.c @@ -33,15 +33,6 @@ #include "visual.h" /* for visual_depth() */ -Widget passwd_dialog; -Widget passwd_form; -Widget roger_label; -Widget passwd_label1; -Widget passwd_label3; -/*Widget passwd_text;*/ -/*Widget passwd_done;*/ -/*Widget passwd_cancel;*/ - Widget resources_dialog; Widget resources_form; Widget timeout_text; @@ -73,75 +64,9 @@ Widget done; Widget restart; /*Widget spacer;*/ -Widget splash_dialog; -Widget splash_form; -Widget splash_roger_label; -Widget splash_label1; -Widget splash_label3; -Widget splash_demo; -Widget splash_prefs; -Widget splash_help; - static Widget buttonbox, textbox, okbox; -void -create_passwd_dialog(Widget parent, Visual *visual, Colormap colormap) -{ - Widget box, passwd_label2; - int depth = visual_depth(XtScreen(parent), visual); - - passwd_dialog = - XtVaCreatePopupShell("passwd_dialog", transientShellWidgetClass, parent, - XtNtitle, NULL, - XtNoverrideRedirect, TRUE, - XtNvisual, visual, - XtNcolormap, colormap, - XtNdepth, depth, - NULL); - - box = XtVaCreateManagedWidget("box", formWidgetClass, passwd_dialog, - XtNleft, XtChainLeft, - XtNright, XtChainRight, - XtNtop, XtChainTop, - XtNbottom, XtChainBottom, - XtNvisual, visual, - XtNcolormap, colormap, - XtNdepth, depth, - NULL); - - roger_label = XtVaCreateManagedWidget("roger", labelWidgetClass, box, - XtNlabel, "", - XtNleft, XtChainLeft, - XtNright, XtChainRight, - XtNtop, XtChainTop, - NULL); - - passwd_label1 = XtVaCreateManagedWidget("label1", labelWidgetClass, box, - XtNfromHoriz, roger_label, - XtNright, XtChainRight, - XtNtop, XtChainTop, - NULL); - passwd_label2 = XtVaCreateManagedWidget("label2", labelWidgetClass, box, - XtNfromHoriz, roger_label, - XtNright, XtChainRight, - XtNfromVert, passwd_label1, - NULL); - passwd_label3 = XtVaCreateManagedWidget("label3", labelWidgetClass, box, - XtNfromHoriz, roger_label, - XtNright, XtChainRight, - XtNfromVert, passwd_label2, - NULL); - - passwd_form = - XtVaCreateManagedWidget("passwd_form", dialogWidgetClass, box, - XtNfromHoriz, roger_label, - XtNright, XtChainRight, - XtNfromVert, passwd_label3, - NULL); -} - - void create_resources_dialog(Widget parent, Visual *visual, Colormap colormap) { @@ -330,63 +255,3 @@ create_demo_dialog(Widget parent, Visual *visual, Colormap colormap) restart = XtVaCreateManagedWidget("restart", commandWidgetClass, box, NULL); done = XtVaCreateManagedWidget("done", commandWidgetClass, box, NULL); } - - -void -create_splash_dialog(Widget parent, Visual *visual, Colormap colormap) -{ - Widget box, splash_label2; - int depth = visual_depth(XtScreen(parent), visual); - - splash_dialog = - XtVaCreatePopupShell("splash_dialog", transientShellWidgetClass, parent, - XtNtitle, NULL, - XtNoverrideRedirect, TRUE, - XtNvisual, visual, - XtNcolormap, colormap, - XtNdepth, depth, - NULL); - - box = XtVaCreateManagedWidget("box", formWidgetClass, splash_dialog, - XtNleft, XtChainLeft, - XtNright, XtChainRight, - XtNtop, XtChainTop, - XtNbottom, XtChainBottom, - XtNvisual, visual, - XtNcolormap, colormap, - XtNdepth, depth, - NULL); - - splash_roger_label = XtVaCreateManagedWidget("roger", labelWidgetClass, box, - XtNlabel, "", - XtNleft, XtChainLeft, - XtNright, XtChainRight, - XtNtop, XtChainTop, - NULL); - - splash_label1 = XtVaCreateManagedWidget("splashLabel1", labelWidgetClass, - box, - XtNfromHoriz, splash_roger_label, - XtNright, XtChainRight, - XtNtop, XtChainTop, - NULL); - splash_label2 = XtVaCreateManagedWidget("splashLabel2", labelWidgetClass, - box, - XtNfromHoriz, splash_roger_label, - XtNright, XtChainRight, - XtNfromVert, splash_label1, - NULL); - splash_label3 = XtVaCreateManagedWidget("splashLabel3", labelWidgetClass, - box, - XtNfromHoriz, splash_roger_label, - XtNright, XtChainRight, - XtNfromVert, splash_label2, - NULL); - - splash_form = - XtVaCreateManagedWidget("splash_form", dialogWidgetClass, box, - XtNfromHoriz, splash_roger_label, - XtNright, XtChainRight, - XtNfromVert, splash_label3, - NULL); -}