mcgrew@aramis.rutgers.edu (Charles Mcgrew) (10/24/90)
Submitted-by: chuck@melmac.harris-atd.com (Chuck Musciano)
Posting-number: Volume 2, Issue 26
Archive-name: contool3.0/patch01
This is patch 1 for contool 3.0, my alternate console tool for
workstations running X Windows.
This patch fixes a few minor bugs, including:
* Dialog boxes now open and close correctly under window managers
other than olwm.
* Handling of custom icons is now fixed.
* Filter files originally created for contool 1.0 now work with
version 3.0.
* The "clean" target in the Makefile is fixed.
Also, this patch creates an Imakefile for use with xmkmf and imake.
Chuck Musciano ARPA : chuck@trantor.harris-atd.com
Harris Corporation Usenet: ...!uunet!x102a!trantor!chuck
PO Box 37, MS 3A/1912 AT&T : (407) 727-6131
Melbourne, FL 32902 FAX : (407) 729-2537
A good newspaper is never good enough,
but a lousy newspaper is a joy forever. -- Garrison Keillor
#! /bin/sh
# This is a shell archive. Remove anything before this line, then unpack
# it by saving it into a file and typing "sh file". To overwrite existing
# files, type "sh file -c". You can also feed this as standard input via
# unshar, or by typing "sh <file", e.g.. If this archive is complete, you
# will see the following message at the end:
# "End of shell archive."
# Contents: patch
# Wrapped by chuck@melmac on Thu Oct 18 10:53:38 1990
PATH=/bin:/usr/bin:/usr/ucb ; export PATH
if test -f 'patch' -a "${1}" != "-c" ; then
echo shar: Will not clobber existing file \"'patch'\"
else
echo shar: Extracting \"'patch'\" \(9176 characters\)
sed "s/^X//" >'patch' <<'END_OF_FILE'
X*** Makefile.orig Thu Oct 18 10:48:43 1990
X--- Makefile Fri Aug 31 14:15:32 1990
X***************
X*** 46,52 ****
X cp -p contool.man $(MAN)/contool.$(MANEXT)
X
X clean:
X! rm -f *~ $(OFILES) contool core
X
X #dependencies
X
X--- 46,52 ----
X cp -p contool.man $(MAN)/contool.$(MANEXT)
X
X clean:
X! rm -f *~ *.o contool core
X
X #dependencies
X
X*** Imakefile.orig Thu Oct 18 10:48:45 1990
X--- Imakefile Thu Oct 18 10:27:16 1990
X***************
X*** 0 ****
X--- 1,22 ----
X+ OPENWINHOME = /usr/openwin
X+
X+ HELPDIR = /usr/local/lib/help
X+
X+ LOCAL_LIBRARIES = -lxview -lolgx $(XLIB)
X+
X+ LDOPTIONS = -L$(OPENWINHOME)/lib
X+
X+ CFLAGS = -O -I$(OPENWINHOME)/include
X+
X+ SRCS = contool.c contool_ui.c error.c expand.c filters.c \
X+ load.c load_icon.c logging.c misc.c parse.y props.c \
X+ regexp.c store.c window_misc.c
X+
X+ OBJS = contool.o contool_ui.o error.o expand.o filters.o \
X+ load.o load_icon.o logging.o misc.o parse.o props.o \
X+ regexp.o store.o window_misc.o
X+
X+ ComplexProgramTarget(contool)
X+
X+ install:: install.man
X+ $(INSTALL) -c $(INSTMANFLAGS) contool.info $(HELPDIR)/contool.info
X*** README.orig Thu Oct 18 10:48:46 1990
X--- README Thu Oct 18 10:22:55 1990
X***************
X*** 171,173 ****
X--- 171,180 ----
X Reworked console overflow handling,
X courtesy of Matt Cohen
X (sysnmc@magic706.chron.com).
X+ 3.0a Allowed reading of 1.0 filter files.
X+ Fixed handling of custom default icon
X+ when blinking stops.
X+ Tweaked Makefile slightly.
X+ Fixed handling of dialog boxes under
X+ window managers other than olwm.
X+ Add Imakefile.
X*** contool.man.orig Thu Oct 18 10:48:47 1990
X--- contool.man Mon Oct 1 14:35:10 1990
X***************
X*** 16,22 ****
X \f2Contool\fP must be run under either Open Windows or X Windows.
X It accepts the standard Open Windows command line options.
X .SH OPTIONS
X! .IP "\fB\\(hyf\fP \fIfile\fP"
X specifies an alternate configuration file. \f2Contool\fP normally
X reads its configuration information from ~/.contool.
X .IP "\fB\\(hyl\fP"
X--- 16,22 ----
X \f2Contool\fP must be run under either Open Windows or X Windows.
X It accepts the standard Open Windows command line options.
X .SH OPTIONS
X! .IP "\fB\\(hyc\fP \fIfile\fP"
X specifies an alternate configuration file. \f2Contool\fP normally
X reads its configuration information from ~/.contool.
X .IP "\fB\\(hyl\fP"
X***************
X*** 46,52 ****
X filters from the file.
X .IP ""
X The text field contains the path of the configuration file. By default,
X! this is either ~/.contool, or the value of the \fB-f\fP option (above).
X This text field provides file name completion, like \f2csh\fP(1), by typing
X a space or carriage return.
X .IP ""
X--- 46,52 ----
X filters from the file.
X .IP ""
X The text field contains the path of the configuration file. By default,
X! this is either ~/.contool, or the value of the \fB-c\fP option (above).
X This text field provides file name completion, like \f2csh\fP(1), by typing
X a space or carriage return.
X .IP ""
X***************
X*** 56,64 ****
X discarded. If \f2contool\fP was in the middle of filtering a multi-line message,
X that filtering action is terminated.
X .IP ""
X! \f2Contool\fP can read files created by versions 2.0, 2.1, 2.2, and 3.0 of
X! \f2contool\fP. Files used by version 1.0 will need to be manually converted
X! by first reading and writing them with any 2.x release of \f2contool\fP.
X .IP "\fBFile: Save Configuration...\fP"
X is analogous to the \fBLoad Configuration\fP operation, bringing up a dialog
X box containing a non-exclusive setting, a text field, and a \fBSave\fP
X--- 56,64 ----
X discarded. If \f2contool\fP was in the middle of filtering a multi-line message,
X that filtering action is terminated.
X .IP ""
X! \f2Contool\fP can read files created by all previous versions of
X! \f2contool\fP. Files written by \f2contool\fP cannot be read by any previous
X! version.
X .IP "\fBFile: Save Configuration...\fP"
X is analogous to the \fBLoad Configuration\fP operation, bringing up a dialog
X box containing a non-exclusive setting, a text field, and a \fBSave\fP
X*** contool.c.orig Thu Oct 18 10:48:50 1990
X--- contool.c Thu Oct 11 10:38:59 1990
X***************
X*** 365,371 ****
X event_in_progress = TRUE;
X if (event_action(event) == ACTION_OPEN && blinking) {
X notify_set_itimer_func(contool_base->base, blink_proc, ITIMER_REAL, NULL, NULL);
X! change_icon(good, good = default_good_icon);
X blinking = FALSE;
X }
X event_in_progress = FALSE;
X--- 365,371 ----
X event_in_progress = TRUE;
X if (event_action(event) == ACTION_OPEN && blinking) {
X notify_set_itimer_func(contool_base->base, blink_proc, ITIMER_REAL, NULL, NULL);
X! change_icon(good, good == default_good_icon);
X blinking = FALSE;
X }
X event_in_progress = FALSE;
X*** contool_ui.c.orig Thu Oct 18 10:48:52 1990
X--- contool_ui.c Thu Oct 18 10:40:18 1990
X***************
X*** 307,313 ****
X XV_KEY_DATA, INSTANCE, ip,
X XV_WIDTH, 575,
X XV_HEIGHT, 246,
X! XV_LABEL, "Contool 3.0",
X FRAME_CLOSED, FALSE,
X FRAME_SHOW_FOOTER, TRUE,
X FRAME_SHOW_RESIZE_CORNER, TRUE,
X--- 307,313 ----
X XV_KEY_DATA, INSTANCE, ip,
X XV_WIDTH, 575,
X XV_HEIGHT, 246,
X! XV_LABEL, "Contool 3.0a",
X FRAME_CLOSED, FALSE,
X FRAME_SHOW_FOOTER, TRUE,
X FRAME_SHOW_RESIZE_CORNER, TRUE,
X*** lex.c.orig Thu Oct 18 10:48:58 1990
X--- lex.c Fri Aug 31 13:58:54 1990
X***************
X*** 49,54 ****
X--- 49,55 ----
X {"nostamp", NOSTAMP},
X {"open", OPEN},
X {"print", PRINT},
X+ {"quiet", QUIET},
X {"save", SAVE},
X {"stamp", STAMP},
X {"timestamp", TIMESTAMP},
X*** parse.y.orig Thu Oct 18 10:49:03 1990
X--- parse.y Fri Aug 31 14:08:54 1990
X***************
X*** 53,63 ****
X
X %token BEEP CHECK_ICON COMMAND COMMENT DEFAULTS DELETE DISPLAY FILTERS
X FLASH FLASH_ICON GOOD_ICON IGNORE LOG_BEFORE_FILTERING LOG_FILE
X! MATCH NO NOFLASH NOOPEN NOSTAMP OPEN PRINT SAVE STAMP TIMESTAMP TO YES
X
X %type <ival> beep flash old_flash old_open old_stamp open stamp yes_no
X %type <cpval> command old_end_string string
X! %type <fval> filter filter_list old_filter old_filter_list old_ignore old_save
X
X %%
X
X--- 53,63 ----
X
X %token BEEP CHECK_ICON COMMAND COMMENT DEFAULTS DELETE DISPLAY FILTERS
X FLASH FLASH_ICON GOOD_ICON IGNORE LOG_BEFORE_FILTERING LOG_FILE
X! MATCH NO NOFLASH NOOPEN NOSTAMP OPEN PRINT QUIET SAVE STAMP TIMESTAMP TO YES
X
X %type <ival> beep flash old_flash old_open old_stamp open stamp yes_no
X %type <cpval> command old_end_string string
X! %type <fval> filter filter_list old_filter old_filter_list old_ignore old_quiet old_save
X
X %%
X
X***************
X*** 86,91 ****
X--- 86,92 ----
X
X old_filter : old_save
X | old_ignore
X+ | old_quiet
X ;
X
X old_save : SAVE beep old_flash old_open old_stamp STRING old_end_string
X***************
X*** 121,126 ****
X--- 122,150 ----
X f->flash = FALSE;
X f->open = FALSE;
X f->stamp = FALSE;
X+ f->start = $2;
X+ f->stop = $3;
X+ f->start_re = NULL;
X+ f->stop_re = NULL;
X+ f->command = NULL;
X+ f->comment = NULL;
X+ f->next = NULL;
X+ if (msg = compile_exp(f, f->start, f->stop))
X+ yyerror(msg);
X+ $$ = f;
X+ }
X+ ;
X+
X+ old_quiet : QUIET STRING old_end_string
X+ { Filter *f;
X+ char *msg;
X+
X+ f = (Filter *) malloc(sizeof(Filter));
X+ f->save = TRUE;
X+ f->beep = 0;
X+ f->flash = FALSE;
X+ f->open = FALSE;
X+ f->stamp = TRUE;
X f->start = $2;
X f->stop = $3;
X f->start_re = NULL;
X*** patchlevel.h.orig Thu Oct 18 10:49:04 1990
X--- patchlevel.h Tue Sep 18 15:06:44 1990
X***************
X*** 3,6 ****
X--- 3,8 ----
X /* Patch Comments */
X /* 0 Initial release for XView */
X /* */
X+ /* 1 Bug fixes; see README for details */
X+ /* */
X /************************************************************************/
X*** window_misc.c.orig Thu Oct 18 10:49:09 1990
X--- window_misc.c Thu Oct 18 09:48:19 1990
X***************
X*** 28,33 ****
X--- 28,34 ----
X #include <xview/xview.h>
X #include <xview/panel.h>
X #include <xview/xv_xrect.h>
X+ #include <X11/Xutil.h>
X
X #include "manifest.h"
X #include "contool_ui.h"
X***************
X*** 80,86 ****
X Xv_opaque base;
X Xv_opaque dialog;
X
X! { Rect br, dr, sr;
X
X sr = *((Rect *) xv_get(base, WIN_SCREEN_RECT));
X frame_get_rect(base, &br);
X--- 81,88 ----
X Xv_opaque base;
X Xv_opaque dialog;
X
X! { Rect br, dr, sr;
X! XWMHints *hints;
X
X sr = *((Rect *) xv_get(base, WIN_SCREEN_RECT));
X frame_get_rect(base, &br);
X***************
X*** 98,101 ****
X--- 100,109 ----
X dr.r_top = br.r_top + 32;
X }
X frame_set_rect(dialog, &dr);
X+
X+ hints = XGetWMHints(xv_get(dialog, XV_DISPLAY), xv_get(dialog, XV_XID));
X+ hints->flags |= StateHint;
X+ hints->initial_state = NormalState;
X+ XSetWMHints(xv_get(dialog, XV_DISPLAY), xv_get(dialog, XV_XID), hints);
X+ XFree(hints);
X }
END_OF_FILE
if test 9176 -ne `wc -c <'patch'`; then
echo shar: \"'patch'\" unpacked with wrong size!
fi
# end of 'patch'
fi
echo shar: End of shell archive.
exit 0
Chuck Musciano ARPA : chuck@trantor.harris-atd.com
Harris Corporation Usenet: ...!uunet!x102a!trantor!chuck
PO Box 37, MS 3A/1912 AT&T : (407) 727-6131
Melbourne, FL 32902 FAX : (407) 729-2537
A good newspaper is never good enough,
but a lousy newspaper is a joy forever. -- Garrison Keillor