/* lock.c --- handling the password dialog for locking-mode.
- * xscreensaver, Copyright (c) 1993-2004 Jamie Zawinski <jwz@jwz.org>
+ * xscreensaver, Copyright (c) 1993-2006 Jamie Zawinski <jwz@jwz.org>
*
* Permission to use, copy, modify, distribute, and sell this software and its
* documentation for any purpose is hereby granted without fee, provided that
# include "config.h"
#endif
+#include <ctype.h>
#include <X11/Intrinsic.h>
+#include <X11/cursorfont.h>
#include <X11/Xos.h> /* for time() */
#include <time.h>
#include <sys/time.h>
static void hp_lock_reset (saver_info *si, Bool lock_p);
#endif /* HAVE_XHPDISABLERESET */
-#ifdef HAVE_VT_LOCKSWITCH
-# include <fcntl.h>
-# include <sys/ioctl.h>
-# include <sys/vt.h>
- static void linux_lock_vt_switch (saver_info *si, Bool lock_p);
-#endif /* HAVE_VT_LOCKSWITCH */
-
#ifdef HAVE_XF86VMODE
# include <X11/extensions/xf86vmode.h>
static void xfree_lock_mode_switch (saver_info *si, Bool lock_p);
ERROR! You must not include vroot.h in this file.
#endif
+#ifdef HAVE_UNAME
+# include <sys/utsname.h> /* for hostname info */
+#endif /* HAVE_UNAME */
+#include <ctype.h>
+
#ifndef VMS
# include <pwd.h>
#else /* VMS */
Dimension height;
Dimension border_width;
+ Bool show_stars_p; /* "I regret that I have but one asterisk for my country."
+ -- Nathan Hale, 1776. */
+
char *heading_label;
char *body_label;
char *user_label;
char *date_label;
char *user_string;
char *passwd_string;
+ char *login_label;
+ char *uname_label;
+
+ Bool show_uname_p;
XFontStruct *heading_font;
XFontStruct *body_font;
XFontStruct *label_font;
XFontStruct *passwd_font;
XFontStruct *date_font;
+ XFontStruct *button_font;
+ XFontStruct *uname_font;
Pixel foreground;
Pixel background;
Pixel thermo_background;
Pixel shadow_top;
Pixel shadow_bottom;
+ Pixel button_foreground;
+ Pixel button_background;
Dimension logo_width;
Dimension logo_height;
Dimension passwd_field_x, passwd_field_y;
Dimension passwd_field_width, passwd_field_height;
+ Dimension login_button_x, login_button_y;
+ Dimension login_button_width, login_button_height;
+
Dimension thermo_field_x, thermo_field_y;
Dimension thermo_field_height;
Pixmap logo_pixmap;
+ Pixmap logo_clipmask;
int logo_npixels;
unsigned long *logo_pixels;
+ Cursor passwd_cursor;
+ Bool login_button_down_p;
+ Bool login_button_p;
+ Bool login_button_enabled_p;
+
Pixmap save_under;
};
float ratio);
static void destroy_passwd_window (saver_info *si);
static void undo_vp_motion (saver_info *si);
+static void handle_passwd_button (saver_info *si, XEvent *event);
static void
char *f;
saver_screen_info *ssi = &si->screens [mouse_screen (si)];
+ /* Display the button only if the "newLoginCommand" pref is non-null.
+ */
+ pw->login_button_p = (si->prefs.new_login_command &&
+ *si->prefs.new_login_command);
+
+ if (pw->login_button_p)
+ pw->passwd_cursor = XCreateFontCursor (si->dpy, XC_top_left_arrow);
+ else
+ pw->passwd_cursor = 0;
+
pw->prompt_screen = ssi;
if (si->prefs.verbose_p)
fprintf (stderr, "%s: %d: creating password dialog.\n",
pw->ratio = 1.0;
- pw->heading_label = get_string_resource ("passwd.heading.label",
+ pw->show_stars_p = get_boolean_resource(si->dpy, "passwd.asterisks",
+ "Boolean");
+
+ pw->heading_label = get_string_resource (si->dpy, "passwd.heading.label",
"Dialog.Label.Label");
- pw->body_label = get_string_resource ("passwd.body.label",
+ pw->body_label = get_string_resource (si->dpy, "passwd.body.label",
"Dialog.Label.Label");
- pw->user_label = get_string_resource ("passwd.user.label",
+ pw->user_label = get_string_resource (si->dpy, "passwd.user.label",
"Dialog.Label.Label");
- pw->passwd_label = get_string_resource ("passwd.passwd.label",
+ pw->passwd_label = get_string_resource (si->dpy, "passwd.passwd.label",
"Dialog.Label.Label");
- pw->date_label = get_string_resource ("dateFormat", "DateFormat");
+ pw->login_label = get_string_resource (si->dpy, "passwd.login.label",
+ "Dialog.Button.Label");
+
+ pw->date_label = get_string_resource (si->dpy, "dateFormat", "DateFormat");
if (!pw->heading_label)
- pw->heading_label = strdup("ERROR: REESOURCES NOT INSTALLED CORRECTLY");
+ pw->heading_label = strdup("ERROR: RESOURCES NOT INSTALLED CORRECTLY");
if (!pw->body_label)
- pw->body_label = strdup("ERROR: REESOURCES NOT INSTALLED CORRECTLY");
+ pw->body_label = strdup("ERROR: RESOURCES NOT INSTALLED CORRECTLY");
if (!pw->user_label) pw->user_label = strdup("ERROR");
if (!pw->passwd_label) pw->passwd_label = strdup("ERROR");
if (!pw->date_label) pw->date_label = strdup("ERROR");
+ if (!pw->login_label) pw->login_label = strdup ("ERROR (LOGIN)") ;
/* Put the version number in the label. */
{
pw->heading_label = s;
}
+ /* Get hostname info */
+ pw->uname_label = strdup(""); /* Initialy, write nothing */
+
+# ifdef HAVE_UNAME
+ {
+ struct utsname uts;
+
+ if (uname (&uts) == 0)
+ {
+#if 0 /* Get the full hostname */
+ {
+ char *s;
+ if ((s = strchr(uts.nodename, '.')))
+ *s = 0;
+ }
+#endif
+ char *s = strdup (uts.nodename);
+ free (pw->uname_label);
+ pw->uname_label = s;
+ }
+ }
+# endif
+
pw->user_string = strdup (p && p->pw_name ? p->pw_name : "???");
pw->passwd_string = strdup("");
- f = get_string_resource ("passwd.headingFont", "Dialog.Font");
+ f = get_string_resource (si->dpy, "passwd.headingFont", "Dialog.Font");
pw->heading_font = XLoadQueryFont (si->dpy, (f ? f : "fixed"));
if (!pw->heading_font) pw->heading_font = XLoadQueryFont (si->dpy, "fixed");
if (f) free (f);
- f = get_string_resource("passwd.bodyFont", "Dialog.Font");
+ f = get_string_resource (si->dpy, "passwd.buttonFont", "Dialog.Font");
+ pw->button_font = XLoadQueryFont (si->dpy, (f ? f : "fixed"));
+ if (!pw->button_font) pw->button_font = XLoadQueryFont (si->dpy, "fixed");
+ if (f) free (f);
+
+ f = get_string_resource(si->dpy, "passwd.bodyFont", "Dialog.Font");
pw->body_font = XLoadQueryFont (si->dpy, (f ? f : "fixed"));
if (!pw->body_font) pw->body_font = XLoadQueryFont (si->dpy, "fixed");
if (f) free (f);
- f = get_string_resource("passwd.labelFont", "Dialog.Font");
+ f = get_string_resource(si->dpy, "passwd.labelFont", "Dialog.Font");
pw->label_font = XLoadQueryFont (si->dpy, (f ? f : "fixed"));
if (!pw->label_font) pw->label_font = XLoadQueryFont (si->dpy, "fixed");
if (f) free (f);
- f = get_string_resource("passwd.passwdFont", "Dialog.Font");
+ f = get_string_resource(si->dpy, "passwd.passwdFont", "Dialog.Font");
pw->passwd_font = XLoadQueryFont (si->dpy, (f ? f : "fixed"));
if (!pw->passwd_font) pw->passwd_font = XLoadQueryFont (si->dpy, "fixed");
if (f) free (f);
- f = get_string_resource("passwd.dateFont", "Dialog.Font");
+ f = get_string_resource(si->dpy, "passwd.dateFont", "Dialog.Font");
pw->date_font = XLoadQueryFont (si->dpy, (f ? f : "fixed"));
if (!pw->date_font) pw->date_font = XLoadQueryFont (si->dpy, "fixed");
if (f) free (f);
- pw->foreground = get_pixel_resource ("passwd.foreground",
- "Dialog.Foreground",
- si->dpy, cmap);
- pw->background = get_pixel_resource ("passwd.background",
- "Dialog.Background",
- si->dpy, cmap);
+ f = get_string_resource(si->dpy, "passwd.unameFont", "Dialog.Font");
+ pw->uname_font = XLoadQueryFont (si->dpy, (f ? f : "fixed"));
+ if (!pw->uname_font) pw->uname_font = XLoadQueryFont (si->dpy, "fixed");
+ if (f) free (f);
+
+ pw->show_uname_p = get_boolean_resource(si->dpy, "passwd.uname", "Boolean");
+
+ pw->foreground = get_pixel_resource (si->dpy, cmap,
+ "passwd.foreground",
+ "Dialog.Foreground" );
+ pw->background = get_pixel_resource (si->dpy, cmap,
+ "passwd.background",
+ "Dialog.Background" );
if (pw->foreground == pw->background)
{
pw->background = WhitePixelOfScreen (screen);
}
- pw->passwd_foreground = get_pixel_resource ("passwd.text.foreground",
- "Dialog.Text.Foreground",
- si->dpy, cmap);
- pw->passwd_background = get_pixel_resource ("passwd.text.background",
- "Dialog.Text.Background",
- si->dpy, cmap);
- pw->thermo_foreground = get_pixel_resource ("passwd.thermometer.foreground",
- "Dialog.Thermometer.Foreground",
- si->dpy, cmap);
- pw->thermo_background = get_pixel_resource ("passwd.thermometer.background",
- "Dialog.Thermometer.Background",
- si->dpy, cmap);
- pw->shadow_top = get_pixel_resource ("passwd.topShadowColor",
- "Dialog.Foreground",
- si->dpy, cmap);
- pw->shadow_bottom = get_pixel_resource ("passwd.bottomShadowColor",
- "Dialog.Background",
- si->dpy, cmap);
-
- pw->logo_width = get_integer_resource ("passwd.logo.width",
+ pw->passwd_foreground = get_pixel_resource (si->dpy, cmap,
+ "passwd.text.foreground",
+ "Dialog.Text.Foreground" );
+ pw->passwd_background = get_pixel_resource (si->dpy, cmap,
+ "passwd.text.background",
+ "Dialog.Text.Background" );
+ pw->button_foreground = get_pixel_resource (si->dpy, cmap,
+ "splash.Button.foreground",
+ "Dialog.Button.Foreground" );
+ pw->button_background = get_pixel_resource (si->dpy, cmap,
+ "splash.Button.background",
+ "Dialog.Button.Background" );
+ pw->thermo_foreground = get_pixel_resource (si->dpy, cmap,
+ "passwd.thermometer.foreground",
+ "Dialog.Thermometer.Foreground" );
+ pw->thermo_background = get_pixel_resource ( si->dpy, cmap,
+ "passwd.thermometer.background",
+ "Dialog.Thermometer.Background" );
+ pw->shadow_top = get_pixel_resource ( si->dpy, cmap,
+ "passwd.topShadowColor",
+ "Dialog.Foreground" );
+ pw->shadow_bottom = get_pixel_resource (si->dpy, cmap,
+ "passwd.bottomShadowColor",
+ "Dialog.Background" );
+
+ pw->logo_width = get_integer_resource (si->dpy, "passwd.logo.width",
"Dialog.Logo.Width");
- pw->logo_height = get_integer_resource ("passwd.logo.height",
+ pw->logo_height = get_integer_resource (si->dpy, "passwd.logo.height",
"Dialog.Logo.Height");
- pw->thermo_width = get_integer_resource ("passwd.thermometer.width",
+ pw->thermo_width = get_integer_resource (si->dpy, "passwd.thermometer.width",
"Dialog.Thermometer.Width");
- pw->internal_border = get_integer_resource ("passwd.internalBorderWidth",
+ pw->internal_border = get_integer_resource (si->dpy, "passwd.internalBorderWidth",
"Dialog.InternalBorderWidth");
- pw->shadow_width = get_integer_resource ("passwd.shadowThickness",
+ pw->shadow_width = get_integer_resource (si->dpy, "passwd.shadowThickness",
"Dialog.ShadowThickness");
if (pw->logo_width == 0) pw->logo_width = 150;
if (overall.width > pw->width) pw->width = overall.width;
pw->height += ascent + descent;
+ /* Measure the uname_label. */
+ if ((strlen(pw->uname_label)) && pw->show_uname_p)
+ {
+ XTextExtents (pw->uname_font,
+ pw->uname_label, strlen(pw->uname_label),
+ &direction, &ascent, &descent, &overall);
+ if (overall.width > pw->width) pw->width = overall.width;
+ pw->height += ascent + descent;
+ }
+
/* Measure the body_label. */
XTextExtents (pw->body_font,
pw->body_label, strlen(pw->body_label),
pw->height += ascent + descent;
{
- Dimension w2 = 0, w3 = 0;
- Dimension h2 = 0, h3 = 0;
+ Dimension w2 = 0, w3 = 0, button_w = 0;
+ Dimension h2 = 0, h3 = 0, button_h = 0;
const char *passwd_string = "MMMMMMMMMMMM";
/* Measure the user_label. */
w2 = w2 + w3 + (pw->shadow_width * 2);
h2 = MAX (h2, h3);
+ pw->login_button_width = 0;
+ pw->login_button_height = 0;
+
+ if (pw->login_button_p)
+ {
+ pw->login_button_enabled_p = True;
+
+ /* Measure the "New Login" button */
+ XTextExtents (pw->button_font, pw->login_label,
+ strlen (pw->login_label),
+ &direction, &ascent, &descent, &overall);
+ button_w = overall.width;
+ button_h = ascent + descent;
+
+ /* Add some horizontal padding inside the buttons. */
+ button_w += ascent;
+
+ button_w += ((ascent + descent) / 2) + (pw->shadow_width * 2);
+ button_h += ((ascent + descent) / 2) + (pw->shadow_width * 2);
+
+ pw->login_button_width = button_w;
+ pw->login_button_height = button_h;
+
+ w2 = MAX (w2, button_w);
+ h2 += button_h * 1.5;
+ }
+
if (w2 > pw->width) pw->width = w2;
pw->height += h2;
}
}
attrmask |= CWOverrideRedirect; attrs.override_redirect = True;
- attrmask |= CWEventMask; attrs.event_mask = ExposureMask|KeyPressMask;
+
+ attrmask |= CWEventMask;
+ attrs.event_mask = (ExposureMask | KeyPressMask |
+ ButtonPressMask | ButtonReleaseMask);
/* We need to remember the mouse position and restore it afterward, or
sometimes (perhaps only with Xinerama?) the mouse gets warped to
if (pw->y < y) pw->y = y;
}
- pw->border_width = get_integer_resource ("passwd.borderWidth",
+ pw->border_width = get_integer_resource (si->dpy, "passwd.borderWidth",
"Dialog.BorderWidth");
si->passwd_dialog =
si->passwd_dialog, cmap,
pw->background,
&pw->logo_pixels, &pw->logo_npixels,
- 0, True);
+ &pw->logo_clipmask, True);
/* Before mapping the window, save the bits that are underneath the
rectangle the window will occlude. When we lower the window, we
XSync (si->dpy, False);
move_mouse_grab (si, si->passwd_dialog,
- pw->prompt_screen->cursor,
+ (pw->passwd_cursor
+ ? pw->passwd_cursor
+ : pw->prompt_screen->cursor),
pw->prompt_screen->number);
undo_vp_motion (si);
int tb_height;
height = (pw->heading_font->ascent + pw->heading_font->descent +
- pw->body_font->ascent + pw->body_font->descent +
- (2 * MAX ((pw->label_font->ascent + pw->label_font->descent),
- (pw->passwd_font->ascent + pw->passwd_font->descent +
- (pw->shadow_width * 4)))) +
- pw->date_font->ascent + pw->date_font->descent
- );
- spacing = ((pw->height - (2 * pw->shadow_width) -
- pw->internal_border - height)) / 8;
+ pw->body_font->ascent + pw->body_font->descent +
+ (2 * MAX ((pw->label_font->ascent + pw->label_font->descent),
+ (pw->passwd_font->ascent + pw->passwd_font->descent +
+ (pw->shadow_width * 4)))) +
+ pw->date_font->ascent + pw->date_font->descent);
+
+ if ((strlen(pw->uname_label)) && pw->show_uname_p)
+ height += (pw->uname_font->ascent + pw->uname_font->descent); /* for uname */
+
+ if (pw->login_button_p)
+ height += ((pw->button_font->ascent + pw->button_font->descent) * 2 +
+ 2 * pw->shadow_width);
+
+ spacing = (((pw->height
+ - ((pw->login_button_p ? 4 : 2) * pw->shadow_width)
+ - pw->internal_border - height))
+ / 8);
+
if (spacing < 0) spacing = 0;
gcv.foreground = pw->foreground;
XDrawString (si->dpy, si->passwd_dialog, gc1, x2, y1,
pw->heading_label, strlen(pw->heading_label));
- /* text below top heading
+ /* uname below top heading
+ */
+ if ((strlen(pw->uname_label)) && pw->show_uname_p)
+ {
+ XSetFont (si->dpy, gc1, pw->uname_font->fid);
+ y1 += spacing + pw->uname_font->ascent + pw->uname_font->descent;
+ sw = string_width (pw->uname_font, pw->uname_label);
+ x2 = (x1 + ((x3 - x1 - sw) / 2));
+ XDrawString (si->dpy, si->passwd_dialog, gc1, x2, y1,
+ pw->uname_label, strlen(pw->uname_label));
+ }
+
+ /* text below uname
*/
XSetFont (si->dpy, gc1, pw->body_font->fid);
y1 += spacing + pw->body_font->ascent + pw->body_font->descent;
string_width (pw->label_font, pw->passwd_label)));
XDrawString (si->dpy, si->passwd_dialog, gc1,
x2 - string_width (pw->label_font, pw->user_label),
- y1,
+ y1 - pw->passwd_font->descent,
pw->user_label, strlen(pw->user_label));
/* the "Password:" prompt
y1 += (spacing + tb_height);
XDrawString (si->dpy, si->passwd_dialog, gc1,
x2 - string_width (pw->label_font, pw->passwd_label),
- y1,
+ y1 - pw->passwd_font->descent,
pw->passwd_label, strlen(pw->passwd_label));
x2 - pw->shadow_width,
y1 - (pw->passwd_font->ascent + pw->passwd_font->descent),
pw->passwd_field_width, pw->passwd_field_height);
- XDrawString (si->dpy, si->passwd_dialog, gc1, x2, y1,
+ XDrawString (si->dpy, si->passwd_dialog, gc1,
+ x2,
+ y1 - pw->passwd_font->descent,
pw->user_string, strlen(pw->user_string));
/* the "password" text field
XDrawString (si->dpy, si->passwd_dialog, gc1, x2, y1, buf, strlen(buf));
}
+ /* The "New Login" button
+ */
+ if (pw->login_button_p)
+ {
+ XSetForeground (si->dpy, gc1, pw->button_foreground);
+ XSetForeground (si->dpy, gc2, pw->button_background);
+ XSetFont (si->dpy, gc1, pw->button_font->fid);
+
+ sw = string_width (pw->button_font, pw->login_label);
+
+ x2 = pw->width - pw->internal_border - (pw->shadow_width * 2);
+
+ /* right aligned button */
+ /* x1 = x2 - pw->login_button_width; */
+
+ /* centered button */
+ x1 = (pw->logo_width + pw->thermo_width + (pw->shadow_width * 3) +
+ pw->internal_border);
+ x1 = x1 + (x2 - x1 - pw->login_button_width) / 2;
+
+ y1 = (pw->height - pw->internal_border - pw->login_button_height +
+ spacing);
+ y2 = (y1 +
+ ((pw->login_button_height -
+ (pw->button_font->ascent + pw->button_font->descent))
+ / 2) +
+ pw->button_font->ascent);
+
+ pw->login_button_x = x1;
+ pw->login_button_y = y1;
+ }
/* The logo
*/
XGetGeometry (si->dpy, pw->logo_pixmap, &root, &x, &y, &w, &h, &bw, &d);
XSetForeground (si->dpy, gc1, pw->foreground);
XSetBackground (si->dpy, gc1, pw->background);
+ XSetClipMask (si->dpy, gc1, pw->logo_clipmask);
+ XSetClipOrigin (si->dpy, gc1, x1 + ((x2 - (int)w) / 2), y1 + ((y2 - (int)h) / 2));
if (d == 1)
XCopyPlane (si->dpy, pw->logo_pixmap, si->passwd_dialog, gc1,
0, 0, w, h,
XDrawString (si->dpy, si->passwd_dialog, gc1,
rects[0].x + pw->shadow_width,
- rects[0].y + (pw->passwd_font->ascent +
- pw->passwd_font->descent),
+ rects[0].y + pw->passwd_font->ascent,
pw->passwd_string, strlen(pw->passwd_string));
XSetClipMask (si->dpy, gc1, None);
if (x > rects[0].x + rects[0].width - 1)
x = rects[0].x + rects[0].width - 1;
XDrawLine (si->dpy, si->passwd_dialog, gc1,
- x, y, x, y + pw->passwd_font->ascent);
+ x, y,
+ x, y + pw->passwd_font->ascent + pw->passwd_font->descent-1);
}
pw->i_beam = (pw->i_beam + 1) % 4;
MAX (0, pw->thermo_field_height - y - 2));
}
+ /* The "New Login" button
+ */
+ if (pw->login_button_p)
+ {
+ int x2, y2, sw;
+ XSetFont (si->dpy, gc1, pw->button_font->fid);
+ XSetForeground (si->dpy, gc1,
+ (pw->login_button_enabled_p
+ ? pw->passwd_foreground
+ : pw->shadow_bottom));
+ XSetForeground (si->dpy, gc2, pw->button_background);
+
+ XFillRectangle (si->dpy, si->passwd_dialog, gc2,
+ pw->login_button_x, pw->login_button_y,
+ pw->login_button_width, pw->login_button_height);
+
+ sw = string_width (pw->button_font, pw->login_label);
+ x2 = pw->login_button_x + ((pw->login_button_width - sw) / 2);
+ y2 = (pw->login_button_y +
+ ((pw->login_button_height -
+ (pw->button_font->ascent + pw->button_font->descent))
+ / 2) +
+ pw->button_font->ascent);
+
+ XDrawString (si->dpy, si->passwd_dialog, gc1, x2, y2,
+ pw->login_label, strlen(pw->login_label));
+
+ draw_shaded_rectangle (si->dpy, si->passwd_dialog,
+ pw->login_button_x, pw->login_button_y,
+ pw->login_button_width, pw->login_button_height,
+ pw->shadow_width,
+ (pw->login_button_down_p
+ ? pw->shadow_bottom
+ : pw->shadow_top),
+ (pw->login_button_down_p
+ ? pw->shadow_top
+ : pw->shadow_bottom));
+ }
+
XFreeGC (si->dpy, gc1);
XFreeGC (si->dpy, gc2);
XSync (si->dpy, False);
move_mouse_grab (si, RootWindowOfScreen (ssi->screen),
ssi->cursor, ssi->number);
+ if (pw->passwd_cursor)
+ XFreeCursor (si->dpy, pw->passwd_cursor);
+
if (p->verbose_p)
fprintf (stderr, "%s: %d: moving mouse back to %d,%d.\n",
blurb(), ssi->number,
if (pw->user_label) free (pw->user_label);
if (pw->passwd_label) free (pw->passwd_label);
if (pw->date_label) free (pw->date_label);
+ if (pw->login_label) free (pw->login_label);
if (pw->user_string) free (pw->user_string);
if (pw->passwd_string) free (pw->passwd_string);
+ if (pw->uname_label) free (pw->uname_label);
if (pw->heading_font) XFreeFont (si->dpy, pw->heading_font);
if (pw->body_font) XFreeFont (si->dpy, pw->body_font);
if (pw->label_font) XFreeFont (si->dpy, pw->label_font);
if (pw->passwd_font) XFreeFont (si->dpy, pw->passwd_font);
if (pw->date_font) XFreeFont (si->dpy, pw->date_font);
+ if (pw->button_font) XFreeFont (si->dpy, pw->button_font);
+ if (pw->uname_font) XFreeFont (si->dpy, pw->uname_font);
if (pw->foreground != black && pw->foreground != white)
XFreeColors (si->dpy, cmap, &pw->foreground, 1, 0L);
if (pw->background != black && pw->background != white)
XFreeColors (si->dpy, cmap, &pw->background, 1, 0L);
+ if (!(pw->button_foreground == black || pw->button_foreground == white))
+ XFreeColors (si->dpy, cmap, &pw->button_foreground, 1, 0L);
+ if (!(pw->button_background == black || pw->button_background == white))
+ XFreeColors (si->dpy, cmap, &pw->button_background, 1, 0L);
if (pw->passwd_foreground != black && pw->passwd_foreground != white)
XFreeColors (si->dpy, cmap, &pw->passwd_foreground, 1, 0L);
if (pw->passwd_background != black && pw->passwd_background != white)
if (pw->logo_pixmap)
XFreePixmap (si->dpy, pw->logo_pixmap);
+ if (pw-> logo_clipmask)
+ XFreePixmap (si->dpy, pw->logo_clipmask);
if (pw->logo_pixels)
{
if (pw->logo_npixels)
XSync (si->dpy, False);
if (error_handler_hit_p) status = 666;
+ if (!lock_p && status == MiscExtGrabStateAlready)
+ status = MiscExtGrabStateSuccess; /* shut up, consider this success */
+
if (p->verbose_p && status != MiscExtGrabStateSuccess)
fprintf (stderr, "%s: error: XF86MiscSetGrabKeysState(%d) returned %s\n",
blurb(), !lock_p,
#endif /* HAVE_XF86MISCSETGRABKEYSSTATE */
-
-\f
-/* This function enables and disables the C-Sh-F1 ... F12 hot-keys,
- which, on Linux systems, switches to another virtual console.
- We'd like the whole screen/keyboard to be locked, not just one
- virtual console, so this function disables that while the X
- screen is locked.
-
- Unfortunately, this doesn't work -- this ioctl only works when
- called by root, and we have disavowed our privileges long ago.
- */
-#ifdef HAVE_VT_LOCKSWITCH
-static void
-linux_lock_vt_switch (saver_info *si, Bool lock_p)
-{
- saver_preferences *p = &si->prefs;
- static Bool vt_locked_p = False;
- const char *dev_console = "/dev/console";
- int fd;
-
- if (lock_p == vt_locked_p)
- return;
-
- if (lock_p && !p->lock_vt_p)
- return;
-
- fd = open (dev_console, O_RDWR);
- if (fd < 0)
- {
- char buf [255];
- sprintf (buf, "%s: couldn't %s VTs: %s", blurb(),
- (lock_p ? "lock" : "unlock"),
- dev_console);
-#if 1 /* #### doesn't work yet, so don't bother complaining */
- perror (buf);
-#endif
- return;
- }
-
- if (ioctl (fd, (lock_p ? VT_LOCKSWITCH : VT_UNLOCKSWITCH)) == 0)
- {
- vt_locked_p = lock_p;
-
- if (p->verbose_p)
- fprintf (stderr, "%s: %s VTs\n", blurb(),
- (lock_p ? "locked" : "unlocked"));
- }
- else
- {
- char buf [255];
- sprintf (buf, "%s: couldn't %s VTs: ioctl", blurb(),
- (lock_p ? "lock" : "unlock"));
-#if 0 /* #### doesn't work yet, so don't bother complaining */
- perror (buf);
-#endif
- }
-
- close (fd);
-}
-#endif /* HAVE_VT_LOCKSWITCH */
-
\f
/* This function enables and disables the C-Alt-Plus and C-Alt-Minus
hot-keys, which normally change the resolution of the X server.
else
pw->timer = 0;
- idle_timer ((XtPointer) si, id);
+ idle_timer ((XtPointer) si, 0);
}
static XComposeStatus *compose_status;
+static void
+handle_passwd_button (saver_info *si, XEvent *event)
+{
+ saver_preferences *p = &si->prefs;
+ Bool mouse_in_box = False;
+ Bool hit_p = False;
+ passwd_dialog_data *pw = si->pw_data;
+ saver_screen_info *ssi = pw->prompt_screen;
+
+ if (! pw->login_button_enabled_p)
+ return;
+
+ mouse_in_box =
+ (event->xbutton.x >= pw->login_button_x &&
+ event->xbutton.x <= pw->login_button_x + pw->login_button_width &&
+ event->xbutton.y >= pw->login_button_y &&
+ event->xbutton.y <= pw->login_button_y + pw->login_button_height);
+
+ if (ButtonRelease == event->xany.type &&
+ pw->login_button_down_p &&
+ mouse_in_box)
+ {
+ /* Only allow them to press the button once: don't want to
+ accidentally launch a dozen gdm choosers if the machine
+ is being slow.
+ */
+ hit_p = True;
+ pw->login_button_enabled_p = False;
+ }
+
+ pw->login_button_down_p = (mouse_in_box &&
+ ButtonRelease != event->xany.type);
+
+ update_passwd_window (si, 0, pw->ratio);
+
+ if (hit_p)
+ fork_and_exec (ssi, p->new_login_command);
+}
+
+
static void
handle_passwd_key (saver_info *si, XKeyEvent *event)
{
s[1] = 0;
+ /* Add 10% to the time remaining every time a key is pressed. */
+ pw->ratio += 0.1;
+ if (pw->ratio > 1) pw->ratio = 1;
+
switch (*s)
{
case '\010': case '\177': /* Backspace */
break;
default:
- i = strlen (typed_passwd);
- if (i >= pw_size-1)
- XBell (si->dpy, 0);
+ /* Though technically the only illegal characters in Unix passwords
+ are LF and NUL, most GUI programs (e.g., GDM) use regular text-entry
+ fields that only let you type printable characters. So, people
+ who use funky characters in their passwords are already broken.
+ We follow that precedent.
+ */
+ if (isprint ((unsigned char) *s))
+ {
+ i = strlen (typed_passwd);
+ if (i >= pw_size-1)
+ XBell (si->dpy, 0);
+ else
+ {
+ typed_passwd [i] = *s;
+ typed_passwd [i+1] = 0;
+ }
+ }
else
- {
- typed_passwd [i] = *s;
- typed_passwd [i+1] = 0;
- }
+ XBell (si->dpy, 0);
break;
}
- i = strlen(typed_passwd);
- stars = (char *) malloc(i+1);
- memset (stars, '*', i);
- stars[i] = 0;
- update_passwd_window (si, stars, pw->ratio);
- free (stars);
+ if (pw->show_stars_p)
+ {
+ i = strlen(typed_passwd);
+ stars = (char *) malloc(i+1);
+ memset (stars, '*', i);
+ stars[i] = 0;
+ update_passwd_window (si, stars, pw->ratio);
+ free (stars);
+ }
+ else
+ {
+ update_passwd_window (si, "", pw->ratio);
+ }
}
saver_preferences *p = &si->prefs;
char *msg = 0;
XEvent event;
+ unsigned int caps_p = 0;
+
passwd_animate_timer ((XtPointer) si, 0);
while (si->pw_data && si->pw_data->state == pw_read)
if (event.xany.window == si->passwd_dialog && event.xany.type == Expose)
draw_passwd_window (si);
else if (event.xany.type == KeyPress)
- handle_passwd_key (si, &event.xkey);
+ {
+ handle_passwd_key (si, &event.xkey);
+ caps_p = (event.xkey.state & LockMask);
+ }
+ else if ((event.xany.type == ButtonPress ||
+ event.xany.type == ButtonRelease) &&
+ si->pw_data->login_button_p)
+ handle_passwd_button (si, &event);
else
XtDispatchEvent (&event);
}
case pw_ok: msg = 0; break;
case pw_null: msg = ""; break;
case pw_time: msg = "Timed out!"; break;
- default: msg = "Sorry!"; break;
+ default: msg = (caps_p ? "CapsLock?" : "Sorry!"); break;
}
if (si->pw_data->state == pw_fail)
case pw_ok:
fprintf (stderr, "%s: password correct.\n", blurb()); break;
case pw_fail:
- fprintf (stderr, "%s: password incorrect!\n", blurb()); break;
+ fprintf (stderr, "%s: password incorrect!%s\n", blurb(),
+ (caps_p ? " (CapsLock)" : ""));
+ break;
case pw_null:
case pw_cancel:
fprintf (stderr, "%s: password entry cancelled.\n", blurb()); break;
#ifdef HAVE_XHPDISABLERESET
hp_lock_reset (si, locked_p); /* turn off/on C-Sh-Reset */
#endif
-#ifdef HAVE_VT_LOCKSWITCH
- linux_lock_vt_switch (si, locked_p); /* turn off/on C-Alt-F1 */
-#endif
#ifdef HAVE_XF86VMODE
xfree_lock_mode_switch (si, locked_p); /* turn off/on C-Alt-Plus */
#endif