X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Fstderr.c;h=d4361df8d5e3a4f72732e3f0282ad5b141faa3f4;hb=0ed85ca0e4b0eae40a4f50a51d63f2f41e45373a;hp=9e536585268f1ac48d1ccdbb79c0214b689b968b;hpb=df053bcb240bd8d82e3bebf48a9766a8728bca4b;p=xscreensaver diff --git a/driver/stderr.c b/driver/stderr.c index 9e536585..d4361df8 100644 --- a/driver/stderr.c +++ b/driver/stderr.c @@ -1,5 +1,5 @@ /* stderr.c --- capturing stdout/stderr output onto the screensaver window. - * xscreensaver, Copyright (c) 1991-1997 Jamie Zawinski + * xscreensaver, Copyright (c) 1991-1998 Jamie Zawinski * * Permission to use, copy, modify, distribute, and sell this software and its * documentation for any purpose is hereby granted without fee, provided that @@ -47,9 +47,14 @@ static char stderr_buffer [4096]; static char *stderr_tail = 0; static time_t stderr_last_read = 0; +static int stderr_stdout_read_fd = -1; + static void make_stderr_overlay_window (saver_screen_info *); +/* Recreates the stderr window or GCs: do this when the xscreensaver window + on a screen has been re-created. + */ void reset_stderr (saver_screen_info *ssi) { @@ -57,7 +62,7 @@ reset_stderr (saver_screen_info *ssi) if (si->prefs.debug_p) fprintf ((real_stderr ? real_stderr : stderr), - "%s: resetting stderr\n", progname); + "%s: resetting stderr\n", blurb()); ssi->stderr_text_x = 0; ssi->stderr_text_y = 0; @@ -75,6 +80,10 @@ reset_stderr (saver_screen_info *ssi) ssi->stderr_cmap = 0; } +/* Erases any stderr text overlaying the screen (if possible) and resets + the stderr output cursor to the upper left. Do this when the xscreensaver + window is cleared. + */ void clear_stderr (saver_screen_info *ssi) { @@ -86,11 +95,12 @@ clear_stderr (saver_screen_info *ssi) } +/* Draws the string on the screen's window. + */ static void print_stderr_1 (saver_screen_info *ssi, char *string) { saver_info *si = ssi->global; - saver_preferences *p = &si->prefs; Display *dpy = si->dpy; Screen *screen = ssi->screen; Window window = (ssi->stderr_overlay_window ? @@ -101,10 +111,6 @@ print_stderr_1 (saver_screen_info *ssi, char *string) char *head = string; char *tail; - /* In verbose mode, copy it to stderr as well. */ - if (p->verbose_p) - fprintf (real_stderr, "%s", string); - if (! ssi->stderr_font) { char *font_name = get_string_resource ("font", "Font"); @@ -131,8 +137,8 @@ print_stderr_1 (saver_screen_info *ssi, char *string) cmap = ssi->stderr_cmap; } - fg = get_pixel_resource ("textForeground", "Foreground", dpy, cmap); - bg = get_pixel_resource ("textBackground", "Background", dpy, cmap); + fg = get_pixel_resource ("overlayTextForeground","Foreground",dpy,cmap); + bg = get_pixel_resource ("overlayTextBackground","Background",dpy,cmap); gcv.font = ssi->stderr_font->fid; gcv.foreground = fg; gcv.background = bg; @@ -168,15 +174,17 @@ print_stderr_1 (saver_screen_info *ssi, char *string) ssi->stderr_text_y = 0; #else int offset = ssi->stderr_line_height * 5; + XWindowAttributes xgwa; + XGetWindowAttributes (dpy, window, &xgwa); + XCopyArea (dpy, window, window, ssi->stderr_gc, 0, v_border + offset, - WidthOfScreen (screen), - (HeightOfScreen (screen) - v_border - v_border - - offset), + xgwa.width, + (xgwa.height - v_border - v_border - offset), 0, v_border); XClearArea (dpy, window, - 0, HeightOfScreen (screen) - v_border - offset, - WidthOfScreen (screen), offset, False); + 0, xgwa.height - v_border - offset, + xgwa.width, offset, False); ssi->stderr_text_y -= offset; #endif } @@ -207,12 +215,14 @@ make_stderr_overlay_window (saver_screen_info *ssi) { int depth = visual_depth (ssi->screen, visual); XSetWindowAttributes attrs; + XWindowAttributes xgwa; unsigned long attrmask; + XGetWindowAttributes (si->dpy, ssi->screensaver_window, &xgwa); if (si->prefs.debug_p) fprintf(real_stderr, "%s: using overlay visual 0x%0x for stderr text layer.\n", - progname, (int) XVisualIDFromVisual (visual)); + blurb(), (int) XVisualIDFromVisual (visual)); ssi->stderr_cmap = XCreateColormap(si->dpy, RootWindowOfScreen(ssi->screen), @@ -229,13 +239,15 @@ make_stderr_overlay_window (saver_screen_info *ssi) ssi->stderr_overlay_window = XCreateWindow(si->dpy, ssi->screensaver_window, 0, 0, - WidthOfScreen(ssi->screen), HeightOfScreen(ssi->screen), + xgwa.width, xgwa.height, 0, depth, InputOutput, visual, attrmask, &attrs); XMapRaised(si->dpy, ssi->stderr_overlay_window); } } +/* Draws the string on each screen's window as error text. + */ static void print_stderr (saver_info *si, char *string) { @@ -251,6 +263,9 @@ print_stderr (saver_info *si, char *string) } +/* Polls the stderr buffer every few seconds and if it finds any text, + writes it on all screens. + */ static void stderr_popup_timer_fn (XtPointer closure, XtIntervalId *id) { @@ -273,6 +288,9 @@ stderr_popup_timer_fn (XtPointer closure, XtIntervalId *id) } +/* Called when data becomes available on the stderr pipe. Copies it into + stderr_buffer where stderr_popup_timer_fn() can find it later. + */ static void stderr_callback (XtPointer closure, int *fd, XtIntervalId *id) { @@ -282,6 +300,9 @@ stderr_callback (XtPointer closure, int *fd, XtIntervalId *id) int size; int read_this_time = 0; + if (!fd || *fd < 0 || *fd != stderr_stdout_read_fd) + abort(); + if (stderr_tail == 0) stderr_tail = stderr_buffer; @@ -334,6 +355,10 @@ stderr_callback (XtPointer closure, int *fd, XtIntervalId *id) } } +/* If stderr capturing is desired, this replaces `stdout' and `stderr' + with a pipe, so that any output written to them will show up on the + screen as well as on the original value of those streams. + */ void initialize_stderr (saver_info *si) { @@ -344,7 +369,7 @@ initialize_stderr (saver_info *si) int stdout_fd = 1; int stderr_fd = 2; int flags = 0; - Boolean stderr_dialog_p, stdout_dialog_p; + Boolean stderr_dialog_p; if (done) return; done = True; @@ -353,9 +378,8 @@ initialize_stderr (saver_info *si) real_stdout = stdout; stderr_dialog_p = get_boolean_resource ("captureStderr", "Boolean"); - stdout_dialog_p = get_boolean_resource ("captureStdout", "Boolean"); - if (!stderr_dialog_p && !stdout_dialog_p) + if (!stderr_dialog_p) return; if (pipe (fds)) @@ -397,6 +421,8 @@ initialize_stderr (saver_info *si) if (stderr_dialog_p) { FILE *new_stderr_file; + FILE *new_stdout_file; + new_stderr = dup (stderr_fd); if (new_stderr < 0) { @@ -416,11 +442,8 @@ initialize_stderr (saver_info *si) perror ("could not dup() a new stderr:"); return; } - } - if (stdout_dialog_p) - { - FILE *new_stdout_file; + new_stdout = dup (stdout_fd); if (new_stdout < 0) { @@ -442,6 +465,31 @@ initialize_stderr (saver_info *si) } } + stderr_stdout_read_fd = in; XtAppAddInput (si->app, in, (XtPointer) XtInputReadMask, stderr_callback, (XtPointer) si); } + + +/* If there is anything in the stderr buffer, flush it to the real stderr. + This does no X operations. Call this when exiting to make sure any + last words actually show up. + */ +void +shutdown_stderr (saver_info *si) +{ + if (!real_stderr || stderr_stdout_read_fd < 0) + return; + + stderr_callback ((XtPointer) si, &stderr_stdout_read_fd, 0); + + if (stderr_buffer && + stderr_tail && + stderr_buffer < stderr_tail) + { + *stderr_tail = 0; + fprintf (real_stderr, "%s", stderr_buffer); + fflush (real_stderr); + stderr_tail = stderr_buffer; + } +}