X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Flock.c;h=194752d1cf5e4404882a4b95ef725dc0b6a8f4f1;hb=72c1f4c1dc6ab07fe121a327ff1c30bf51ef74c1;hp=4ca3d51344527b526f85eb3facb063be2a0af43a;hpb=278c59e14c53fd412b734e699bd4f314f766f804;p=xscreensaver diff --git a/driver/lock.c b/driver/lock.c index 4ca3d513..194752d1 100644 --- a/driver/lock.c +++ b/driver/lock.c @@ -17,20 +17,35 @@ # include "config.h" #endif -#ifndef NO_LOCKING /* whole file */ - #include +#include /* for time() */ #include "xscreensaver.h" #include "resources.h" +#ifndef NO_LOCKING /* (mostly) whole file */ + #ifdef HAVE_SYSLOG # include #endif /* HAVE_SYSLOG */ +#ifdef HAVE_XHPDISABLERESET +# include + static void hp_lock_reset (saver_info *si, Bool lock_p); +#endif /* HAVE_XHPDISABLERESET */ + +#ifdef HAVE_VT_LOCKSWITCH +# include +# include +# include + static void linux_lock_vt_switch (saver_info *si, Bool lock_p); +#endif /* HAVE_VT_LOCKSWITCH */ + #ifdef HAVE_XF86VMODE # include + static void xfree_lock_mode_switch (saver_info *si, Bool lock_p); #endif /* HAVE_XF86VMODE */ + #ifdef _VROOT_H_ ERROR! You must not include vroot.h in this file. #endif @@ -75,6 +90,7 @@ struct passwd_dialog_data { char *body_label; char *user_label; char *passwd_label; + char *date_label; char *user_string; char *passwd_string; @@ -82,6 +98,7 @@ struct passwd_dialog_data { XFontStruct *body_font; XFontStruct *label_font; XFontStruct *passwd_font; + XFontStruct *date_font; Pixel foreground; Pixel background; @@ -112,7 +129,6 @@ static void update_passwd_window (saver_info *si, const char *printed_passwd, float ratio); static void destroy_passwd_window (saver_info *si); static void undo_vp_motion (saver_info *si); -static void set_vp_mode_switch_locked (saver_info *si, Bool locked_p); static void @@ -136,6 +152,7 @@ make_passwd_window (saver_info *si) "Dialog.Label.Label"); pw->passwd_label = get_string_resource ("passwd.passwd.label", "Dialog.Label.Label"); + pw->date_label = get_string_resource ("dateFormat", "DateFormat"); if (!pw->heading_label) pw->heading_label = strdup("ERROR: REESOURCES NOT INSTALLED CORRECTLY"); @@ -143,6 +160,7 @@ make_passwd_window (saver_info *si) pw->body_label = strdup("ERROR: REESOURCES 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"); /* Put the version number in the label. */ { @@ -175,6 +193,11 @@ make_passwd_window (saver_info *si) if (!pw->passwd_font) pw->passwd_font = XLoadQueryFont (si->dpy, "fixed"); if (f) free (f); + f = get_string_resource("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); @@ -360,7 +383,6 @@ make_passwd_window (saver_info *si) move_mouse_grab (si, si->passwd_dialog, si->screens[0].cursor); undo_vp_motion (si); - set_vp_mode_switch_locked (si, True); si->pw_data = pw; @@ -369,7 +391,7 @@ make_passwd_window (saver_info *si) } -void +static void draw_passwd_window (saver_info *si) { passwd_dialog_data *pw = si->pw_data; @@ -384,7 +406,9 @@ draw_passwd_window (saver_info *si) 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->shadow_width * 4)))) + + pw->date_font->ascent + pw->date_font->descent + ); spacing = ((pw->height - (2 * pw->shadow_width) - pw->internal_border - height)) / 8; if (spacing < 0) spacing = 0; @@ -492,6 +516,26 @@ draw_passwd_window (saver_info *si) pw->shadow_width, pw->shadow_bottom, pw->shadow_top); + + /* The date, below the text fields + */ + { + char buf[100]; + time_t now = time ((time_t *) 0); + struct tm *tm = localtime (&now); + memset (buf, 0, sizeof(buf)); + strftime (buf, sizeof(buf)-1, pw->date_label, tm); + + XSetFont (si->dpy, gc1, pw->date_font->fid); + y1 += pw->shadow_width; + y1 += (spacing + tb_height); + y1 += spacing/2; + sw = string_width (pw->date_font, buf); + x2 = x1 + x2 - sw; + XDrawString (si->dpy, si->passwd_dialog, gc1, x2, y1, buf, strlen(buf)); + } + + /* the logo */ XSetForeground (si->dpy, gc1, pw->logo_foreground); @@ -558,7 +602,7 @@ draw_passwd_window (saver_info *si) } -void +static void update_passwd_window (saver_info *si, const char *printed_passwd, float ratio) { passwd_dialog_data *pw = si->pw_data; @@ -642,7 +686,7 @@ update_passwd_window (saver_info *si, const char *printed_passwd, float ratio) } -void +static void destroy_passwd_window (saver_info *si) { passwd_dialog_data *pw = si->pw_data; @@ -656,7 +700,6 @@ destroy_passwd_window (saver_info *si) move_mouse_grab (si, RootWindowOfScreen(si->screens[0].screen), si->screens[0].cursor); - set_vp_mode_switch_locked (si, False); if (si->passwd_dialog) { @@ -715,6 +758,157 @@ destroy_passwd_window (saver_info *si) si->pw_data = 0; } + +#ifdef HAVE_XHPDISABLERESET +/* This function enables and disables the C-Sh-Reset hot-key, which + normally resets the X server (logging out the logged-in user.) + We don't want random people to be able to do that while the + screen is locked. + */ +static void +hp_lock_reset (saver_info *si, Bool lock_p) +{ + static Bool hp_locked_p = False; + + /* Calls to XHPDisableReset and XHPEnableReset must be balanced, + or BadAccess errors occur. (It's ok for this to be global, + since it affects the whole machine, not just the current screen.) + */ + if (hp_locked_p == lock_p) + return; + + if (lock_p) + XHPDisableReset (si->dpy); + else + XHPEnableReset (si->dpy); + hp_locked_p = lock_p; +} +#endif /* HAVE_XHPDISABLERESET */ + + + +/* 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 */ + + +/* This function enables and disables the C-Alt-Plus and C-Alt-Minus + hot-keys, which normally change the resolution of the X server. + We don't want people to be able to switch the server resolution + while the screen is locked, because if they switch to a higher + resolution, it could cause part of the underlying desktop to become + exposed. + */ +#ifdef HAVE_XF86VMODE + +static int ignore_all_errors_ehandler (Display *dpy, XErrorEvent *error); +static Bool vp_got_error = False; + +static void +xfree_lock_mode_switch (saver_info *si, Bool lock_p) +{ + static Bool mode_locked_p = False; + saver_preferences *p = &si->prefs; + int screen = 0; /* always screen 0 */ + int event, error; + Bool status; + XErrorHandler old_handler; + + if (mode_locked_p == lock_p) + return; + if (!XF86VidModeQueryExtension (si->dpy, &event, &error)) + return; + + XSync (si->dpy, False); + old_handler = XSetErrorHandler (ignore_all_errors_ehandler); + status = XF86VidModeLockModeSwitch (si->dpy, screen, lock_p); + XSync (si->dpy, False); + XSetErrorHandler (old_handler); + if (vp_got_error) status = False; + + if (status) + mode_locked_p = lock_p; + + if (!status && (p->verbose_p || !lock_p)) + /* Only print this when verbose, or when we locked but can't unlock. + I tried printing this message whenever it comes up, but + mode-locking always fails if DontZoom is set in XF86Config. */ + fprintf (stderr, "%s: unable to %s mode switching!\n", + blurb(), (lock_p ? "lock" : "unlock")); + else if (p->verbose_p) + fprintf (stderr, "%s: %s mode switching.\n", + blurb(), (lock_p ? "locked" : "unlocked")); +} + +static int +ignore_all_errors_ehandler (Display *dpy, XErrorEvent *error) +{ + vp_got_error = True; + return 0; +} + +#endif /* HAVE_XF86VMODE */ + + +/* If the viewport has been scrolled since the screen was blanked, + then scroll it back to where it belongs. This function only exists + to patch over a very brief race condition. + */ static void undo_vp_motion (saver_info *si) { @@ -741,7 +935,7 @@ undo_vp_motion (saver_info *si) screen doesn't continue to scroll after we've reset the viewport. */ XSync (si->dpy, False); - usleep (250); /* 1/4 second */ + usleep (250000); /* 1/4 second */ XSync (si->dpy, False); status = XF86VidModeSetViewPort (si->dpy, screen, @@ -758,29 +952,6 @@ undo_vp_motion (saver_info *si) } -static void -set_vp_mode_switch_locked (saver_info *si, Bool locked_p) -{ -#ifdef HAVE_XF86VMODE - saver_preferences *p = &si->prefs; - int screen = 0; /* always screen 0 */ - int event, error; - Bool status; - - if (!XF86VidModeQueryExtension (si->dpy, &event, &error)) - return; - status = XF86VidModeLockModeSwitch (si->dpy, screen, locked_p); - - if (!status) - fprintf (stderr, "%s: unable to %s vp switching!\n", - blurb(), (locked_p ? "lock" : "unlock")); - else if (p->verbose_p) - fprintf (stderr, "%s: %s vp switching.\n", - blurb(), (locked_p ? "locked" : "unlocked")); -#endif /* HAVE_XF86VMODE */ -} - - /* Interactions */ @@ -993,6 +1164,30 @@ passwd_event_loop (saver_info *si) } +static void +handle_typeahead (saver_info *si) +{ + passwd_dialog_data *pw = si->pw_data; + int i; + if (!si->unlock_typeahead) + return; + + i = strlen (si->unlock_typeahead); + if (i >= sizeof(pw->typed_passwd) - 1) + i = sizeof(pw->typed_passwd) - 1; + + memcpy (pw->typed_passwd, si->unlock_typeahead, i); + pw->typed_passwd [i] = 0; + + memset (si->unlock_typeahead, '*', strlen(si->unlock_typeahead)); + si->unlock_typeahead[i] = 0; + update_passwd_window (si, si->unlock_typeahead, pw->ratio); + + free (si->unlock_typeahead); + si->unlock_typeahead = 0; +} + + Bool unlock_p (saver_info *si) { @@ -1001,6 +1196,8 @@ unlock_p (saver_info *si) Colormap cmap = DefaultColormapOfScreen (screen); Bool status; + raise_window (si, True, True, True); + if (p->verbose_p) fprintf (stderr, "%s: prompting for password.\n", blurb()); @@ -1010,6 +1207,7 @@ unlock_p (saver_info *si) make_passwd_window (si); if (cmap) XInstallColormap (si->dpy, cmap); + handle_typeahead (si); passwd_event_loop (si); status = (si->pw_data->state == pw_ok); @@ -1021,4 +1219,32 @@ unlock_p (saver_info *si) return status; } -#endif /* !NO_LOCKING -- whole file */ + +void +set_locked_p (saver_info *si, Bool locked_p) +{ + si->locked_p = locked_p; + +#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 + + store_saver_status (si); /* store locked-p */ +} + + +#else /* NO_LOCKING -- whole file */ + +void +set_locked_p (saver_info *si, Bool locked_p) +{ + if (locked_p) abort(); +} + +#endif /* !NO_LOCKING */