-/* xscreensaver, Copyright (c) 1993 Jamie Zawinski <jwz@lucid.com>
+/* lock.c --- handling the password dialog for locking-mode.
+ * xscreensaver, Copyright (c) 1993-1998 Jamie Zawinski <jwz@netscape.com>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
* implied warranty.
*/
-#if __STDC__
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
+/* Athena locking code contributed by Jon A. Christopher <jac8782@tamu.edu> */
+/* Copyright 1997, with the same permissions as above. */
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
#endif
-#include <pwd.h>
-#include <stdio.h>
+#ifndef NO_LOCKING /* whole file */
+#include <X11/StringDefs.h>
#include <X11/Intrinsic.h>
+#include "xscreensaver.h"
+#include "resources.h"
-#if !__STDC__
-# define _NO_PROTO
-#endif
+#ifndef VMS
+# include <pwd.h>
+#else /* VMS */
+extern char *getenv(const char *name);
+extern int validate_user(char *name, char *password);
+static char * user_vms;
+#endif /* VMS */
-#include <Xm/Xm.h>
-#include <Xm/List.h>
-#include <Xm/TextF.h>
-#include "xscreensaver.h"
+#ifdef HAVE_ATHENA
+
+# include <X11/Shell.h>
+# include <X11/StringDefs.h>
+# include <X11/Xaw/Text.h>
+# include <X11/Xaw/Label.h>
+# include <X11/Xaw/Dialog.h>
+
+static void passwd_done_cb (Widget, XtPointer, XtPointer);
+static XtActionsRec actionsList[] =
+{
+ {"passwdentered", (XtActionProc) passwd_done_cb},
+};
-#ifndef NO_LOCKING
+static char Translations[] =
+"\
+<Key>Return: passwdentered()\
+";
+
+#else /* HAVE_MOTIF */
-Time passwd_timeout;
+# include <Xm/Xm.h>
+# include <Xm/List.h>
+# include <Xm/TextF.h>
-extern char *screensaver_version;
-extern char *progname;
-extern XtAppContext app;
-extern Bool verbose_p;
+#endif /* HAVE_MOTIF */
extern Widget passwd_dialog;
extern Widget passwd_form;
extern Widget roger_label;
extern Widget passwd_label1;
extern Widget passwd_label3;
-extern Widget passwd_text;
-extern Widget passwd_done;
extern Widget passwd_cancel;
-extern create_passwd_dialog ();
-
-static enum { pw_read, pw_ok, pw_fail, pw_cancel, pw_time } passwd_state;
-static char typed_passwd [1024];
+#ifdef HAVE_MOTIF
+extern Widget passwd_text;
+extern Widget passwd_done;
+#else /* HAVE_ATHENA */
+static Widget passwd_text = 0; /* gag... */
+static Widget passwd_done = 0;
+#endif /* HAVE_ATHENA */
-static char root_passwd [255];
-static char user_passwd [255];
-Bool
-lock_init ()
-{
- Bool ok = True;
- struct passwd *p;
- char *u;
- p = getpwnam ("root");
- if (p && p->pw_passwd && p->pw_passwd[0] != '*')
- strcpy (root_passwd, p->pw_passwd);
- else
- {
- fprintf (stderr, "%s: couldn't get root's password\n", progname);
- strcpy (root_passwd, "*");
- }
- u = getlogin ();
- if (u)
- p = getpwnam (u);
- else
- {
- /* getlogin() fails if not attached to a terminal;
- in that case, use getpwuid(). */
- p = getpwuid (getuid ());
- u = p->pw_name;
- }
+static enum { pw_read, pw_ok, pw_fail, pw_cancel, pw_time } passwd_state;
+static char typed_passwd [80];
- if (p && p->pw_passwd && p->pw_passwd[0] != '*')
- strcpy (user_passwd, p->pw_passwd);
- else
- {
- fprintf (stderr, "%s: couldn't get password of \"%s\"\n", progname, u);
- strcpy (user_passwd, "*");
- ok = False;
- }
- return ok;
-}
+\f
+#if defined(HAVE_ATHENA) || (XmVersion >= 1002)
+ /* The `destroy' bug apears to be fixed as of Motif 1.2.1, but
+ the `verify-callback' bug is still present. */
+# define DESTROY_WORKS
+#endif
static void
-passwd_cancel_cb (button, client_data, call_data)
- Widget button;
- XtPointer client_data, call_data;
+passwd_cancel_cb (Widget button, XtPointer client_data, XtPointer call_data)
{
passwd_state = pw_cancel;
}
static void
-passwd_done_cb (button, client_data, call_data)
- Widget button;
- XtPointer client_data, call_data;
+passwd_done_cb (Widget button, XtPointer client_data, XtPointer call_data)
{
if (passwd_state != pw_read) return; /* already done */
- if (!strcmp ((char *) crypt (typed_passwd, user_passwd), user_passwd))
- passwd_state = pw_ok;
- /* do not allow root to have empty passwd */
- else if (typed_passwd [0] &&
- !strcmp ((char *) crypt (typed_passwd, root_passwd), root_passwd))
+#ifndef VMS
+
+# ifdef HAVE_ATHENA
+ strncpy(typed_passwd, XawDialogGetValueString(passwd_form),
+ sizeof(typed_passwd)-1);
+ typed_passwd[sizeof(typed_passwd)-1] = 0;
+# endif /* HAVE_ATHENA */
+ if (passwd_valid_p (typed_passwd))
passwd_state = pw_ok;
else
passwd_state = pw_fail;
+
+#else /* VMS */
+ user_vms = getenv("USER");
+ if (validate_user(user_vms,typed_passwd) == 1)
+ passwd_state = pw_ok;
+ else
+ passwd_state = pw_fail;
+#endif /* VMS */
}
-#ifdef VERIFY_CALLBACK_WORKS
+#if defined(HAVE_MOTIF) && defined(VERIFY_CALLBACK_WORKS)
+
+ /* It looks to me like adding any modifyVerify callback causes
+ Motif 1.1.4 to free the the TextF_Value() twice. I can't see
+ the bug in the Motif source, but Purify complains, even if
+ check_passwd_cb() is a no-op.
- /* #### It looks to me like adding any modifyVerify callback causes
- #### Motif 1.1.4 to free the the TextF_Value() twice. I can't see
- #### the bug in the Motif source, but Purify complains, even if
- #### check_passwd_cb() is a no-op.
+ Update: Motif 1.2.1 also loses, but in a different way: it
+ writes beyond the end of a malloc'ed block in ModifyVerify().
+ Probably this block is the text field's text.
*/
static void
-check_passwd_cb (button, client_data, call_data)
- Widget button;
- XtPointer client_data, call_data;
+check_passwd_cb (Widget button, XtPointer client_data, XtPointer call_data)
{
XmTextVerifyCallbackStruct *vcb = (XmTextVerifyCallbackStruct *) call_data;
else if (vcb->text->ptr != 0)
{
int i;
- strncat (typed_passwd, vcb->text->ptr, vcb->text->length);
- typed_passwd [vcb->endPos + vcb->text->length] = 0;
+ int L = vcb->text->length;
+ if (L >= sizeof(typed_passwd))
+ L = sizeof(typed_passwd)-1;
+ strncat (typed_passwd, vcb->text->ptr, L);
+ typed_passwd [vcb->endPos + L] = 0;
for (i = 0; i < vcb->text->length; i++)
vcb->text->ptr [i] = '*';
}
}
-#else /* !VERIFY_CALLBACK_WORKS */
+# else /* HAVE_ATHENA || !VERIFY_CALLBACK_WORKS */
-static void keypress();
-static void backspace();
-static void kill_line();
-static void done();
+static void keypress (Widget w, XEvent *event, String *av, Cardinal *ac);
+static void backspace (Widget w, XEvent *event, String *av, Cardinal *ac);
+static void kill_line (Widget w, XEvent *event, String *av, Cardinal *ac);
+static void done (Widget w, XEvent *event, String *av, Cardinal *ac);
static XtActionsRec actions[] = {{"keypress", keypress},
{"backspace", backspace},
{"done", done}
};
-#if 0 /* oh fuck, why doesn't this work? */
+# ifdef HAVE_MOTIF
+# if 0 /* oh fuck, why doesn't this work? */
static char translations[] = "\
<Key>BackSpace: backspace()\n\
<Key>Delete: backspace()\n\
Ctrl<Key>M: done()\n\
<Key>: keypress()\n\
";
-#else
+# else /* !0 */
static char translations[] = "<Key>:keypress()";
-#endif
+# endif /* !0 */
+# endif /* HAVE_MOTIF */
+
+
+static void
+text_field_set_string (Widget widget, char *text, int position)
+{
+#ifdef HAVE_MOTIF
+ XmTextFieldSetString (widget, text);
+ XmTextFieldSetInsertionPosition (widget, position);
+
+#else /* HAVE_ATHENA */
+ char *buf;
+ int end_pos;
+
+ XawTextBlock block;
+ block.firstPos = 0;
+ block.length = strlen (text);
+ block.ptr = text;
+ block.format = 0;
+ if (block.length == 0)
+ {
+ buf = XawDialogGetValueString(passwd_form);
+ if (buf)
+ end_pos = strlen(buf);
+ else
+ end_pos = -1;
+ }
+ XawTextReplace (widget, 0, end_pos, &block);
+ XawTextSetInsertionPoint (widget, position);
+#endif /* HAVE_ATHENA */
+}
+
static void
-keypress (w, event, argv, argc)
- Widget w;
- XEvent *event;
- String *argv;
- Cardinal *argc;
+keypress (Widget w, XEvent *event, String *argv, Cardinal *argc)
{
int i, j;
- char s [sizeof (typed_passwd)];
- int size = XLookupString ((XKeyEvent *) event, s, sizeof (s), 0, 0);
+ char s [sizeof(typed_passwd)];
+ int size = XLookupString ((XKeyEvent *) event, s, sizeof(s)-1, 0, 0);
if (size != 1) return;
/* hack because I can't get translations to dance to my tune... */
if (*s == '\015') { done (w, event, argv, argc); return; }
i = j = strlen (typed_passwd);
+
+ if (i >= (sizeof(typed_passwd)-1))
+ {
+ XBell(XtDisplay(w), 0);
+ return;
+ }
+
typed_passwd [i] = *s;
s [++i] = 0;
while (i--)
s [i] = '*';
- XmTextFieldSetString (passwd_text, s);
- XmTextFieldSetInsertionPosition (passwd_text, j + 1);
+
+ text_field_set_string (passwd_text, s, j + 1);
}
static void
-backspace (w, event, argv, argc)
- Widget w;
- XEvent *event;
- String *argv;
- Cardinal *argc;
+backspace (Widget w, XEvent *event, String *argv, Cardinal *argc)
{
- char s [sizeof (typed_passwd)];
+ char s [sizeof(typed_passwd)];
int i = strlen (typed_passwd);
int j = i;
if (i == 0)
s [i] = 0;
while (i--)
s [i] = '*';
- XmTextFieldSetString (passwd_text, s);
- XmTextFieldSetInsertionPosition (passwd_text, j + 1);
+
+ text_field_set_string (passwd_text, s, j + 1);
}
static void
-kill_line (w, event, argv, argc)
- Widget w;
- XEvent *event;
- String *argv;
- Cardinal *argc;
+kill_line (Widget w, XEvent *event, String *argv, Cardinal *argc)
{
- memset (typed_passwd, 0, sizeof (typed_passwd));
- XmTextFieldSetString (passwd_text, "");
+ memset (typed_passwd, 0, sizeof(typed_passwd));
+ text_field_set_string (passwd_text, "", 0);
}
static void
-done (w, event, argv, argc)
- Widget w;
- XEvent *event;
- String *argv;
- Cardinal *argc;
+done (Widget w, XEvent *event, String *argv, Cardinal *argc)
{
passwd_done_cb (w, 0, 0);
}
-#endif /* !VERIFY_CALLBACK_WORKS */
+#endif /* HAVE_ATHENA || !VERIFY_CALLBACK_WORKS */
-static void
-format_into_label (widget, string)
- Widget widget;
- char *string;
-{
- char *label;
- char buf [255];
- XmString xm_label = 0;
- XmString new_xm_label;
- Arg av[10];
- int ac = 0;
- XtSetArg (av [ac], XmNlabelString, &xm_label); ac++;
- XtGetValues (widget, av, ac);
- XmStringGetLtoR (xm_label, XmSTRING_DEFAULT_CHARSET, &label);
- if (!strcmp (label, XtName (widget)))
- strcpy (buf, "ERROR: RESOURCES ARE NOT INSTALLED CORRECTLY");
- else
- sprintf (buf, label, string);
- new_xm_label = XmStringCreate (buf, XmSTRING_DEFAULT_CHARSET);
- ac = 0;
- XtSetArg (av [ac], XmNlabelString, new_xm_label); ac++;
- XtSetValues (widget, av, ac);
- XmStringFree (new_xm_label);
- XtFree (label);
-}
-#if __STDC__
extern void skull (Display *, Window, GC, GC, int, int, int, int);
-#endif
static void
-roger (button, client_data, call_data)
- Widget button;
- XtPointer client_data, call_data;
+roger (Widget button, XtPointer client_data, XtPointer call_data)
{
Display *dpy = XtDisplay (button);
Screen *screen = XtScreen (button);
if (size > 40) size -= 30;
x = (xgwa.width - size) / 2;
y = (xgwa.height - size) / 2;
- XtSetArg (av [ac], XmNforeground, &fg); ac++;
- XtSetArg (av [ac], XmNbackground, &bg); ac++;
+ XtSetArg (av [ac], XtNforeground, &fg); ac++;
+ XtSetArg (av [ac], XtNbackground, &bg); ac++;
XtGetValues (button, av, ac);
/* if it's black on white, swap it cause it looks better (hack hack) */
if (fg == BlackPixelOfScreen (screen) && bg == WhitePixelOfScreen (screen))
}
static void
-make_passwd_dialog (parent)
- Widget parent;
+make_passwd_dialog (saver_info *si)
{
- struct passwd *pw;
- create_passwd_dialog (parent);
+ char *username = 0;
+ saver_screen_info *ssi = si->default_screen;
+ Widget parent = ssi->toplevel_shell;
+
+ if (ssi->demo_cmap &&
+ ssi->demo_cmap != ssi->cmap &&
+ ssi->demo_cmap != DefaultColormapOfScreen (ssi->screen))
+ {
+ XFreeColormap (si->dpy, ssi->demo_cmap);
+ ssi->demo_cmap = 0;
+ }
+
+ if (ssi->default_visual == DefaultVisualOfScreen (ssi->screen))
+ ssi->demo_cmap = DefaultColormapOfScreen (ssi->screen);
+ else
+ ssi->demo_cmap = XCreateColormap (si->dpy,
+ RootWindowOfScreen (ssi->screen),
+ ssi->default_visual, AllocNone);
+
+ create_passwd_dialog (parent, ssi->default_visual, ssi->demo_cmap);
+
+#ifdef HAVE_ATHENA
+
+ XtVaSetValues(passwd_form, XtNvalue, typed_passwd, 0);
+
+ XawDialogAddButton(passwd_form,"ok", passwd_done_cb, 0);
+ XawDialogAddButton(passwd_form,"cancel", passwd_cancel_cb, 0);
+ passwd_done = XtNameToWidget(passwd_form,"ok");
+ passwd_text = XtNameToWidget(passwd_form,"value");
+
+ XtAppAddActions(XtWidgetToApplicationContext(passwd_text),
+ actionsList, XtNumber(actionsList));
+ XtOverrideTranslations(passwd_text, XtParseTranslationTable(Translations));
+
+#else /* HAVE_MOTIF */
XtAddCallback (passwd_done, XmNactivateCallback, passwd_done_cb, 0);
XtAddCallback (passwd_cancel, XmNactivateCallback, passwd_cancel_cb, 0);
XtAddCallback (roger_label, XmNexposeCallback, roger, 0);
-#ifdef VERIFY_CALLBACK_WORKS
+# ifdef VERIFY_CALLBACK_WORKS
XtAddCallback (passwd_text, XmNmodifyVerifyCallback, check_passwd_cb, 0);
XtAddCallback (passwd_text, XmNactivateCallback, check_passwd_cb, 0);
-#else
+# else
XtAddCallback (passwd_text, XmNactivateCallback, passwd_done_cb, 0);
XtOverrideTranslations (passwd_text, XtParseTranslationTable (translations));
-#endif
+# endif
- pw = getpwuid (getuid ());
- format_into_label (passwd_label3, (pw->pw_name ? pw->pw_name : "???"));
- format_into_label (passwd_label1, screensaver_version);
-}
+# if defined(HAVE_MOTIF) && (XmVersion >= 1002)
+ /* The focus stuff changed around; this didn't exist in 1.1.5. */
+ XtVaSetValues (passwd_form, XmNinitialFocus, passwd_text, 0);
+# endif
+ /* Another random thing necessary in 1.2.1 but not 1.1.5... */
+ XtVaSetValues (roger_label, XmNborderWidth, 2, 0);
-extern void idle_timer ();
+#endif /* HAVE_MOTIF */
-static int passwd_idle_timer_tick;
-static XtIntervalId id;
+#ifndef VMS
+ {
+ struct passwd *pw = getpwuid (getuid ());
+ username = pw->pw_name;
+ }
+#else /* VMS -- from "R.S.Niranjan" <U00C782%BRKVC1@navistar.com> who says
+ that on OpenVMS 6.1, using `struct passwd' crashes... */
+ username = getenv("USER");
+#endif /* VMS */
+
+ format_into_label (passwd_label1, si->version);
+ format_into_label (passwd_label3, (username ? username : "???"));
+}
+
+static int passwd_idle_timer_tick = -1;
+static XtIntervalId passwd_idle_id;
static void
-passwd_idle_timer (junk1, junk2)
- void *junk1;
- XtPointer junk2;
+passwd_idle_timer (XtPointer closure, XtIntervalId *id)
{
+ saver_info *si = (saver_info *) closure;
+ saver_preferences *p = &si->prefs;
+
Display *dpy = XtDisplay (passwd_form);
+#ifdef HAVE_ATHENA
Window window = XtWindow (passwd_form);
+#else /* MOTIF */
+ Window window = XtWindow (XtParent(passwd_done));
+#endif /* MOTIF */
static Dimension x, y, d, s, ss;
static GC gc = 0;
- int max = passwd_timeout / 1000;
+ int max = p->passwd_timeout / 1000;
- idle_timer (junk1, junk2);
+ idle_timer ((XtPointer) si, id);
if (passwd_idle_timer_tick == max) /* first time */
{
- Arg av [10];
- int ac = 0;
XGCValues gcv;
- unsigned long fg, bg;
- XtSetArg (av [ac], XmNheight, &d); ac++;
+#ifdef HAVE_MOTIF
+ unsigned long fg = 0, bg = 0, ts = 0, bs = 0;
+ Dimension w = 0, h = 0;
+ XtVaGetValues(XtParent(passwd_done),
+ XmNwidth, &w,
+ 0);
+ XtVaGetValues(passwd_done,
+ XmNheight, &h,
+ XmNy, &y,
+ XtNforeground, &fg,
+ XtNbackground, &bg,
+ XmNtopShadowColor, &ts,
+ XmNbottomShadowColor, &bs,
+ 0);
+
+ if (ts != bg && ts != fg)
+ fg = ts;
+ if (bs != bg && bs != fg)
+ fg = bs;
+
+ d = h / 2;
+ if (d & 1) d++;
+
+ x = (w / 2);
+
+#ifdef __sgi /* Kludge -- SGI's Motif hacks place buttons differently. */
+ {
+ static int sgi_mode = -1;
+ if (sgi_mode == -1)
+ sgi_mode = get_boolean_resource("sgiMode", "sgiMode") ? 1 : 0;
+
+ if (sgi_mode)
+ x = d;
+ }
+#endif /* __sgi */
+
+ x -= d/2;
+ y += d/2;
+
+#else /* HAVE_ATHENA */
+
+ Arg av [100];
+ int ac = 0;
+ unsigned long fg = 0, bg = 0;
+ XtSetArg (av [ac], XtNheight, &d); ac++;
XtGetValues (passwd_done, av, ac);
ac = 0;
- XtSetArg (av [ac], XmNwidth, &x); ac++;
- XtSetArg (av [ac], XmNheight, &y); ac++;
- XtSetArg (av [ac], XmNforeground, &fg); ac++;
- XtSetArg (av [ac], XmNbackground, &bg); ac++;
+ XtSetArg (av [ac], XtNwidth, &x); ac++;
+ XtSetArg (av [ac], XtNheight, &y); ac++;
+ XtSetArg (av [ac], XtNforeground, &fg); ac++;
+ XtSetArg (av [ac], XtNbackground, &bg); ac++;
XtGetValues (passwd_form, av, ac);
x -= d;
y -= d;
d -= 4;
+
+#endif /* HAVE_ATHENA */
+
gcv.foreground = fg;
if (gc) XFreeGC (dpy, gc);
gc = XCreateGC (dpy, window, GCForeground, &gcv);
if (--passwd_idle_timer_tick)
{
- id = XtAppAddTimeOut (app, 1000, passwd_idle_timer, 0);
+ passwd_idle_id = XtAppAddTimeOut (si->app, 1000, passwd_idle_timer,
+ (XtPointer) si);
XFillArc (dpy, window, gc, x, y, d, d, ss, s);
ss += s;
}
}
-extern void pop_up_dialog_box ();
-extern int BadWindow_ehandler ();
+
+#ifdef HAVE_ATHENA
+
+void
+pop_up_athena_dialog_box (Widget parent, Widget focus, Widget dialog,
+ Widget form, int where)
+{
+ /* modified from demo.c */
+ /* I'm sure this is the wrong way to pop up a dialog box, but I can't
+ figure out how else to do it.
+
+ It's important that the screensaver dialogs not get decorated or
+ otherwise reparented by the window manager, because they need to be
+ children of the *real* root window, not the WM's virtual root, in
+ order for us to guarentee that they are visible above the screensaver
+ window itself.
+ */
+ Arg av [100];
+ int ac = 0;
+ Dimension sw, sh, x, y, w, h;
+
+ XtRealizeWidget(dialog);
+ sw = WidthOfScreen (XtScreen (dialog));
+ sh = HeightOfScreen (XtScreen (dialog));
+ ac = 0;
+ XtSetArg (av [ac], XtNwidth, &w); ac++;
+ XtSetArg (av [ac], XtNheight, &h); ac++;
+ XtGetValues (form, av, ac);
+ switch (where)
+ {
+ case 0: /* center it in the top-right quadrant */
+ x = (sw/2 + w) / 2 + (sw/2) - w;
+ y = (sh/2 + h) / 2 - h;
+ break;
+ case 1: /* center it in the bottom-right quadrant */
+ x = (sw/2 + w) / 2 + (sw/2) - w;
+ y = (sh/2 + h) / 2 + (sh/2) - h;
+ break;
+ case 2: /* center it on the screen */
+ x = (sw + w) / 2 - w;
+ y = (sh + h) / 2 - h;
+ break;
+ default:
+ abort ();
+ }
+ if (x + w > sw) x = sw - w;
+ if (y + h > sh) y = sh - h;
+ ac = 0;
+ XtVaSetValues(dialog,
+ XtNx, x,
+ XtNy, y,
+ NULL);
+ XtVaSetValues(form,
+ XtNx, x,
+ XtNy, y,
+ NULL);
+ XtPopup(dialog,XtGrabNone);
+ steal_focus_and_colormap (focus);
+}
+
+static void
+passwd_set_label (char *buf, int len)
+{
+ Widget label;
+ if (!passwd_text)
+ return;
+ label=XtNameToWidget(XtParent(passwd_text),"*label");
+ XtVaSetValues(label,
+ XtNlabel, buf,
+ NULL);
+}
+#endif /* HAVE_ATHENA */
static Bool
-pop_passwd_dialog (parent)
- Widget parent;
+pop_passwd_dialog (saver_info *si)
{
+ saver_preferences *p = &si->prefs;
+ saver_screen_info *ssi = si->default_screen;
+ Widget parent = ssi->toplevel_shell;
Display *dpy = XtDisplay (passwd_dialog);
Window focus;
int revert_to;
+ int i;
+
typed_passwd [0] = 0;
passwd_state = pw_read;
- XmTextFieldSetString (passwd_text, "");
+ text_field_set_string (passwd_text, "", 0);
+
+ /* In case one of the hacks has unmapped it temporarily...
+ Get that sucker on stage now! */
+ for (i = 0; i < si->nscreens; i++)
+ XMapRaised(si->dpy, si->screens[i].screensaver_window);
XGetInputFocus (dpy, &focus, &revert_to);
-#ifndef DESTROY_WORKS
+#if defined(HAVE_MOTIF) && !defined(DESTROY_WORKS)
/* This fucker blows up if we destroy the widget. I can't figure
out why. The second destroy phase dereferences freed memory...
So we just keep it around; but unrealizing or unmanaging it
doesn't work right either, so we hack the window directly. FMH.
*/
if (XtWindow (passwd_form))
- XMapWindow (dpy, XtWindow (passwd_dialog));
+ XMapRaised (dpy, XtWindow (passwd_dialog));
#endif
- pop_up_dialog_box (passwd_dialog, passwd_form, 2);
+ monitor_power_on (si);
+#ifdef HAVE_ATHENA
+ pop_up_athena_dialog_box (parent, passwd_text, passwd_dialog,
+ passwd_form, 2);
+#else
+ pop_up_dialog_box (passwd_dialog, passwd_form,
+ /* for debugging -- don't ask */
+ (si->prefs.debug_p ? 69 : 0) +
+ 2);
XtManageChild (passwd_form);
- XSetInputFocus (dpy, XtWindow (passwd_dialog), revert_to, CurrentTime);
- XmProcessTraversal (passwd_text, 0);
+#endif
- passwd_idle_timer_tick = passwd_timeout / 1000;
- id = XtAppAddTimeOut (app, 1000, passwd_idle_timer, 0);
+#if defined(HAVE_MOTIF) && (XmVersion < 1002)
+ /* The focus stuff changed around; this causes problems in 1.2.1
+ but is necessary in 1.1.5. */
+ XmProcessTraversal (passwd_text, XmTRAVERSE_CURRENT);
+#endif
+ passwd_idle_timer_tick = p->passwd_timeout / 1000;
+ passwd_idle_id = XtAppAddTimeOut (si->app, 1000, passwd_idle_timer,
+ (XtPointer) si);
- XGrabServer (dpy); /* ############ DANGER! */
+#ifdef HAVE_ATHENA
+ if (roger_label)
+ roger(roger_label, 0, 0);
+#endif /* HAVE_ATHENA */
+
+ if (!si->prefs.debug_p)
+ XGrabServer (dpy); /* ############ DANGER! */
+
+ /* this call to ungrab used to be in main_loop() - see comment in
+ xscreensaver.c around line 857. */
+ ungrab_keyboard_and_mouse (si);
while (passwd_state == pw_read)
{
XEvent event;
- XtAppNextEvent (app, &event);
+ XtAppNextEvent (si->app, &event);
/* wait for timer event */
if (event.xany.type == 0 && passwd_idle_timer_tick == 0)
passwd_state = pw_time;
XSync (dpy, False); /* ###### (danger over) */
if (passwd_state != pw_time)
- XtRemoveTimeOut (id);
+ XtRemoveTimeOut (passwd_idle_id);
if (passwd_state != pw_ok)
{
case pw_cancel: lose = 0; break;
default: abort ();
}
+#ifdef HAVE_MOTIF
XmProcessTraversal (passwd_cancel, 0); /* turn off I-beam */
+#endif
if (lose)
{
- XmTextFieldSetString (passwd_text, lose);
- XmTextFieldSetInsertionPosition (passwd_text, strlen (lose) + 1);
+#ifdef HAVE_ATHENA
+ /* show the message */
+ passwd_set_label(lose,strlen(lose)+1);
+
+ /* and clear the password line */
+ memset(typed_passwd, 0, sizeof(typed_passwd));
+ text_field_set_string (passwd_text, "", 0);
+#else
+ text_field_set_string (passwd_text, lose, strlen (lose) + 1);
+#endif
passwd_idle_timer_tick = 1;
- id = XtAppAddTimeOut (app, 3000, passwd_idle_timer, 0);
+ passwd_idle_id = XtAppAddTimeOut (si->app, 3000, passwd_idle_timer,
+ (XtPointer) si);
while (1)
{
XEvent event;
- XtAppNextEvent (app, &event);
+ XtAppNextEvent (si->app, &event);
if (event.xany.type == 0 && /* wait for timer event */
passwd_idle_timer_tick == 0)
break;
}
}
}
- memset (typed_passwd, 0, sizeof (typed_passwd));
- XmTextFieldSetString (passwd_text, "");
+ memset (typed_passwd, 0, sizeof(typed_passwd));
+ text_field_set_string (passwd_text, "", 0);
XtSetKeyboardFocus (parent, None);
-#ifndef DESTROY_WORKS
+#ifdef DESTROY_WORKS
XtDestroyWidget (passwd_dialog);
passwd_dialog = 0;
#else
XUnmapWindow (XtDisplay (passwd_dialog), XtWindow (passwd_dialog));
#endif
{
- int (*old_handler) ();
- old_handler = XSetErrorHandler (BadWindow_ehandler);
+ XErrorHandler old_handler = XSetErrorHandler (BadWindow_ehandler);
/* I don't understand why this doesn't refocus on the old selected
window when MWM is running in click-to-type mode. The value of
`focus' seems to be correct. */
XSetErrorHandler (old_handler);
}
+ /* Since we installed our colormap to display the dialog properly, put
+ the old one back, so that the screensaver_window is now displayed
+ properly. */
+ for (i = 0; i < si->nscreens; i++)
+ {
+ saver_screen_info *ssi = &si->screens[i];
+ if (ssi->cmap)
+ XInstallColormap (si->dpy, ssi->cmap);
+ }
+
return (passwd_state == pw_ok ? True : False);
}
Bool
-unlock_p (parent)
- Widget parent;
+unlock_p (saver_info *si)
{
static Bool initted = False;
if (! initted)
{
#ifndef VERIFY_CALLBACK_WORKS
- XtAppAddActions (app, actions, XtNumber (actions));
+ XtAppAddActions (si->app, actions, XtNumber (actions));
#endif
passwd_dialog = 0;
initted = True;
}
if (! passwd_dialog)
- make_passwd_dialog (parent);
- return pop_passwd_dialog (parent);
+ make_passwd_dialog (si);
+ return pop_passwd_dialog (si);
}
-#endif /* !NO_LOCKING */
+#endif /* !NO_LOCKING -- whole file */
projects / xscreensaver / blobdiff