Tue Nov 14 17:17:53 PST 2000 Michael Jennings <mej@eterm.org>
Since someone wanted it, if no name is given but an exec line (the -e option) is given, the name defaults to the first word in the exec line instead of "Eterm-<version>". For example, Eterm -e ssh foo would get the title "ssh". NOTE: Most Eterm themes already specify a name, so this will not work with those themes. SVN revision: 3886
This commit is contained in:
parent
93d6f6907e
commit
718ea96410
340
COPYING
340
COPYING
|
@ -1,340 +0,0 @@
|
||||||
GNU GENERAL PUBLIC LICENSE
|
|
||||||
Version 2, June 1991
|
|
||||||
|
|
||||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
|
|
||||||
59 Temple Place - Suite 330, Boston, MA
|
|
||||||
02111-1307, USA.
|
|
||||||
Everyone is permitted to copy and distribute verbatim copies
|
|
||||||
of this license document, but changing it is not allowed.
|
|
||||||
|
|
||||||
Preamble
|
|
||||||
|
|
||||||
The licenses for most software are designed to take away your
|
|
||||||
freedom to share and change it. By contrast, the GNU General Public
|
|
||||||
License is intended to guarantee your freedom to share and change free
|
|
||||||
software--to make sure the software is free for all its users. This
|
|
||||||
General Public License applies to most of the Free Software
|
|
||||||
Foundation's software and to any other program whose authors commit to
|
|
||||||
using it. (Some other Free Software Foundation software is covered by
|
|
||||||
the GNU Library General Public License instead.) You can apply it to
|
|
||||||
your programs, too.
|
|
||||||
|
|
||||||
When we speak of free software, we are referring to freedom, not
|
|
||||||
price. Our General Public Licenses are designed to make sure that you
|
|
||||||
have the freedom to distribute copies of free software (and charge for
|
|
||||||
this service if you wish), that you receive source code or can get it
|
|
||||||
if you want it, that you can change the software or use pieces of it
|
|
||||||
in new free programs; and that you know you can do these things.
|
|
||||||
|
|
||||||
To protect your rights, we need to make restrictions that forbid
|
|
||||||
anyone to deny you these rights or to ask you to surrender the rights.
|
|
||||||
These restrictions translate to certain responsibilities for you if you
|
|
||||||
distribute copies of the software, or if you modify it.
|
|
||||||
|
|
||||||
For example, if you distribute copies of such a program, whether
|
|
||||||
gratis or for a fee, you must give the recipients all the rights that
|
|
||||||
you have. You must make sure that they, too, receive or can get the
|
|
||||||
source code. And you must show them these terms so they know their
|
|
||||||
rights.
|
|
||||||
|
|
||||||
We protect your rights with two steps: (1) copyright the software, and
|
|
||||||
(2) offer you this license which gives you legal permission to copy,
|
|
||||||
distribute and/or modify the software.
|
|
||||||
|
|
||||||
Also, for each author's protection and ours, we want to make certain
|
|
||||||
that everyone understands that there is no warranty for this free
|
|
||||||
software. If the software is modified by someone else and passed on, we
|
|
||||||
want its recipients to know that what they have is not the original, so
|
|
||||||
that any problems introduced by others will not reflect on the original
|
|
||||||
authors' reputations.
|
|
||||||
|
|
||||||
Finally, any free program is threatened constantly by software
|
|
||||||
patents. We wish to avoid the danger that redistributors of a free
|
|
||||||
program will individually obtain patent licenses, in effect making the
|
|
||||||
program proprietary. To prevent this, we have made it clear that any
|
|
||||||
patent must be licensed for everyone's free use or not licensed at all.
|
|
||||||
|
|
||||||
The precise terms and conditions for copying, distribution and
|
|
||||||
modification follow.
|
|
||||||
|
|
||||||
GNU GENERAL PUBLIC LICENSE
|
|
||||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
|
||||||
|
|
||||||
0. This License applies to any program or other work which contains
|
|
||||||
a notice placed by the copyright holder saying it may be distributed
|
|
||||||
under the terms of this General Public License. The "Program", below,
|
|
||||||
refers to any such program or work, and a "work based on the Program"
|
|
||||||
means either the Program or any derivative work under copyright law:
|
|
||||||
that is to say, a work containing the Program or a portion of it,
|
|
||||||
either verbatim or with modifications and/or translated into another
|
|
||||||
language. (Hereinafter, translation is included without limitation in
|
|
||||||
the term "modification".) Each licensee is addressed as "you".
|
|
||||||
|
|
||||||
Activities other than copying, distribution and modification are not
|
|
||||||
covered by this License; they are outside its scope. The act of
|
|
||||||
running the Program is not restricted, and the output from the Program
|
|
||||||
is covered only if its contents constitute a work based on the
|
|
||||||
Program (independent of having been made by running the Program).
|
|
||||||
Whether that is true depends on what the Program does.
|
|
||||||
|
|
||||||
1. You may copy and distribute verbatim copies of the Program's
|
|
||||||
source code as you receive it, in any medium, provided that you
|
|
||||||
conspicuously and appropriately publish on each copy an appropriate
|
|
||||||
copyright notice and disclaimer of warranty; keep intact all the
|
|
||||||
notices that refer to this License and to the absence of any warranty;
|
|
||||||
and give any other recipients of the Program a copy of this License
|
|
||||||
along with the Program.
|
|
||||||
|
|
||||||
You may charge a fee for the physical act of transferring a copy, and
|
|
||||||
you may at your option offer warranty protection in exchange for a fee.
|
|
||||||
|
|
||||||
2. You may modify your copy or copies of the Program or any portion
|
|
||||||
of it, thus forming a work based on the Program, and copy and
|
|
||||||
distribute such modifications or work under the terms of Section 1
|
|
||||||
above, provided that you also meet all of these conditions:
|
|
||||||
|
|
||||||
a) You must cause the modified files to carry prominent notices
|
|
||||||
stating that you changed the files and the date of any change.
|
|
||||||
|
|
||||||
b) You must cause any work that you distribute or publish, that in
|
|
||||||
whole or in part contains or is derived from the Program or any
|
|
||||||
part thereof, to be licensed as a whole at no charge to all third
|
|
||||||
parties under the terms of this License.
|
|
||||||
|
|
||||||
c) If the modified program normally reads commands interactively
|
|
||||||
when run, you must cause it, when started running for such
|
|
||||||
interactive use in the most ordinary way, to print or display an
|
|
||||||
announcement including an appropriate copyright notice and a
|
|
||||||
notice that there is no warranty (or else, saying that you provide
|
|
||||||
a warranty) and that users may redistribute the program under
|
|
||||||
these conditions, and telling the user how to view a copy of this
|
|
||||||
License. (Exception: if the Program itself is interactive but
|
|
||||||
does not normally print such an announcement, your work based on
|
|
||||||
the Program is not required to print an announcement.)
|
|
||||||
|
|
||||||
These requirements apply to the modified work as a whole. If
|
|
||||||
identifiable sections of that work are not derived from the Program,
|
|
||||||
and can be reasonably considered independent and separate works in
|
|
||||||
themselves, then this License, and its terms, do not apply to those
|
|
||||||
sections when you distribute them as separate works. But when you
|
|
||||||
distribute the same sections as part of a whole which is a work based
|
|
||||||
on the Program, the distribution of the whole must be on the terms of
|
|
||||||
this License, whose permissions for other licensees extend to the
|
|
||||||
entire whole, and thus to each and every part regardless of who wrote it.
|
|
||||||
|
|
||||||
Thus, it is not the intent of this section to claim rights or contest
|
|
||||||
your rights to work written entirely by you; rather, the intent is to
|
|
||||||
exercise the right to control the distribution of derivative or
|
|
||||||
collective works based on the Program.
|
|
||||||
|
|
||||||
In addition, mere aggregation of another work not based on the Program
|
|
||||||
with the Program (or with a work based on the Program) on a volume of
|
|
||||||
a storage or distribution medium does not bring the other work under
|
|
||||||
the scope of this License.
|
|
||||||
|
|
||||||
3. You may copy and distribute the Program (or a work based on it,
|
|
||||||
under Section 2) in object code or executable form under the terms of
|
|
||||||
Sections 1 and 2 above provided that you also do one of the following:
|
|
||||||
|
|
||||||
a) Accompany it with the complete corresponding machine-readable
|
|
||||||
source code, which must be distributed under the terms of Sections
|
|
||||||
1 and 2 above on a medium customarily used for software interchange; or,
|
|
||||||
|
|
||||||
b) Accompany it with a written offer, valid for at least three
|
|
||||||
years, to give any third party, for a charge no more than your
|
|
||||||
cost of physically performing source distribution, a complete
|
|
||||||
machine-readable copy of the corresponding source code, to be
|
|
||||||
distributed under the terms of Sections 1 and 2 above on a medium
|
|
||||||
customarily used for software interchange; or,
|
|
||||||
|
|
||||||
c) Accompany it with the information you received as to the offer
|
|
||||||
to distribute corresponding source code. (This alternative is
|
|
||||||
allowed only for noncommercial distribution and only if you
|
|
||||||
received the program in object code or executable form with such
|
|
||||||
an offer, in accord with Subsection b above.)
|
|
||||||
|
|
||||||
The source code for a work means the preferred form of the work for
|
|
||||||
making modifications to it. For an executable work, complete source
|
|
||||||
code means all the source code for all modules it contains, plus any
|
|
||||||
associated interface definition files, plus the scripts used to
|
|
||||||
control compilation and installation of the executable. However, as a
|
|
||||||
special exception, the source code distributed need not include
|
|
||||||
anything that is normally distributed (in either source or binary
|
|
||||||
form) with the major components (compiler, kernel, and so on) of the
|
|
||||||
operating system on which the executable runs, unless that component
|
|
||||||
itself accompanies the executable.
|
|
||||||
|
|
||||||
If distribution of executable or object code is made by offering
|
|
||||||
access to copy from a designated place, then offering equivalent
|
|
||||||
access to copy the source code from the same place counts as
|
|
||||||
distribution of the source code, even though third parties are not
|
|
||||||
compelled to copy the source along with the object code.
|
|
||||||
|
|
||||||
4. You may not copy, modify, sublicense, or distribute the Program
|
|
||||||
except as expressly provided under this License. Any attempt
|
|
||||||
otherwise to copy, modify, sublicense or distribute the Program is
|
|
||||||
void, and will automatically terminate your rights under this License.
|
|
||||||
However, parties who have received copies, or rights, from you under
|
|
||||||
this License will not have their licenses terminated so long as such
|
|
||||||
parties remain in full compliance.
|
|
||||||
|
|
||||||
5. You are not required to accept this License, since you have not
|
|
||||||
signed it. However, nothing else grants you permission to modify or
|
|
||||||
distribute the Program or its derivative works. These actions are
|
|
||||||
prohibited by law if you do not accept this License. Therefore, by
|
|
||||||
modifying or distributing the Program (or any work based on the
|
|
||||||
Program), you indicate your acceptance of this License to do so, and
|
|
||||||
all its terms and conditions for copying, distributing or modifying
|
|
||||||
the Program or works based on it.
|
|
||||||
|
|
||||||
6. Each time you redistribute the Program (or any work based on the
|
|
||||||
Program), the recipient automatically receives a license from the
|
|
||||||
original licensor to copy, distribute or modify the Program subject to
|
|
||||||
these terms and conditions. You may not impose any further
|
|
||||||
restrictions on the recipients' exercise of the rights granted herein.
|
|
||||||
You are not responsible for enforcing compliance by third parties to
|
|
||||||
this License.
|
|
||||||
|
|
||||||
7. If, as a consequence of a court judgment or allegation of patent
|
|
||||||
infringement or for any other reason (not limited to patent issues),
|
|
||||||
conditions are imposed on you (whether by court order, agreement or
|
|
||||||
otherwise) that contradict the conditions of this License, they do not
|
|
||||||
excuse you from the conditions of this License. If you cannot
|
|
||||||
distribute so as to satisfy simultaneously your obligations under this
|
|
||||||
License and any other pertinent obligations, then as a consequence you
|
|
||||||
may not distribute the Program at all. For example, if a patent
|
|
||||||
license would not permit royalty-free redistribution of the Program by
|
|
||||||
all those who receive copies directly or indirectly through you, then
|
|
||||||
the only way you could satisfy both it and this License would be to
|
|
||||||
refrain entirely from distribution of the Program.
|
|
||||||
|
|
||||||
If any portion of this section is held invalid or unenforceable under
|
|
||||||
any particular circumstance, the balance of the section is intended to
|
|
||||||
apply and the section as a whole is intended to apply in other
|
|
||||||
circumstances.
|
|
||||||
|
|
||||||
It is not the purpose of this section to induce you to infringe any
|
|
||||||
patents or other property right claims or to contest validity of any
|
|
||||||
such claims; this section has the sole purpose of protecting the
|
|
||||||
integrity of the free software distribution system, which is
|
|
||||||
implemented by public license practices. Many people have made
|
|
||||||
generous contributions to the wide range of software distributed
|
|
||||||
through that system in reliance on consistent application of that
|
|
||||||
system; it is up to the author/donor to decide if he or she is willing
|
|
||||||
to distribute software through any other system and a licensee cannot
|
|
||||||
impose that choice.
|
|
||||||
|
|
||||||
This section is intended to make thoroughly clear what is believed to
|
|
||||||
be a consequence of the rest of this License.
|
|
||||||
|
|
||||||
8. If the distribution and/or use of the Program is restricted in
|
|
||||||
certain countries either by patents or by copyrighted interfaces, the
|
|
||||||
original copyright holder who places the Program under this License
|
|
||||||
may add an explicit geographical distribution limitation excluding
|
|
||||||
those countries, so that distribution is permitted only in or among
|
|
||||||
countries not thus excluded. In such case, this License incorporates
|
|
||||||
the limitation as if written in the body of this License.
|
|
||||||
|
|
||||||
9. The Free Software Foundation may publish revised and/or new versions
|
|
||||||
of the General Public License from time to time. Such new versions will
|
|
||||||
be similar in spirit to the present version, but may differ in detail to
|
|
||||||
address new problems or concerns.
|
|
||||||
|
|
||||||
Each version is given a distinguishing version number. If the Program
|
|
||||||
specifies a version number of this License which applies to it and "any
|
|
||||||
later version", you have the option of following the terms and conditions
|
|
||||||
either of that version or of any later version published by the Free
|
|
||||||
Software Foundation. If the Program does not specify a version number of
|
|
||||||
this License, you may choose any version ever published by the Free Software
|
|
||||||
Foundation.
|
|
||||||
|
|
||||||
10. If you wish to incorporate parts of the Program into other free
|
|
||||||
programs whose distribution conditions are different, write to the author
|
|
||||||
to ask for permission. For software which is copyrighted by the Free
|
|
||||||
Software Foundation, write to the Free Software Foundation; we sometimes
|
|
||||||
make exceptions for this. Our decision will be guided by the two goals
|
|
||||||
of preserving the free status of all derivatives of our free software and
|
|
||||||
of promoting the sharing and reuse of software generally.
|
|
||||||
|
|
||||||
NO WARRANTY
|
|
||||||
|
|
||||||
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
|
||||||
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
|
||||||
OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
|
|
||||||
PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
|
|
||||||
OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
|
||||||
MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
|
|
||||||
TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
|
|
||||||
PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
|
|
||||||
REPAIR OR CORRECTION.
|
|
||||||
|
|
||||||
12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
|
||||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
|
|
||||||
REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
|
|
||||||
INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
|
|
||||||
OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
|
|
||||||
TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
|
|
||||||
YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
|
||||||
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
|
||||||
POSSIBILITY OF SUCH DAMAGES.
|
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
Appendix: How to Apply These Terms to Your New Programs
|
|
||||||
|
|
||||||
If you develop a new program, and you want it to be of the greatest
|
|
||||||
possible use to the public, the best way to achieve this is to make it
|
|
||||||
free software which everyone can redistribute and change under these terms.
|
|
||||||
|
|
||||||
To do so, attach the following notices to the program. It is safest
|
|
||||||
to attach them to the start of each source file to most effectively
|
|
||||||
convey the exclusion of warranty; and each file should have at least
|
|
||||||
the "copyright" line and a pointer to where the full notice is found.
|
|
||||||
|
|
||||||
<one line to give the program's name and a brief idea of what it does.>
|
|
||||||
Copyright (C) 19yy <name of author>
|
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation; either version 2 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program; if not, write to the Free Software
|
|
||||||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
||||||
|
|
||||||
Also add information on how to contact you by electronic and paper mail.
|
|
||||||
|
|
||||||
If the program is interactive, make it output a short notice like this
|
|
||||||
when it starts in an interactive mode:
|
|
||||||
|
|
||||||
Gnomovision version 69, Copyright (C) 19yy name of author
|
|
||||||
Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
|
||||||
This is free software, and you are welcome to redistribute it
|
|
||||||
under certain conditions; type `show c' for details.
|
|
||||||
|
|
||||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
|
||||||
parts of the General Public License. Of course, the commands you use may
|
|
||||||
be called something other than `show w' and `show c'; they could even be
|
|
||||||
mouse-clicks or menu items--whatever suits your program.
|
|
||||||
|
|
||||||
You should also get your employer (if you work as a programmer) or your
|
|
||||||
school, if any, to sign a "copyright disclaimer" for the program, if
|
|
||||||
necessary. Here is a sample; alter the names:
|
|
||||||
|
|
||||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the program
|
|
||||||
`Gnomovision' (which makes passes at compilers) written by James Hacker.
|
|
||||||
|
|
||||||
<signature of Ty Coon>, 1 April 1989
|
|
||||||
Ty Coon, President of Vice
|
|
||||||
|
|
||||||
This General Public License does not permit incorporating your program into
|
|
||||||
proprietary programs. If your program is a subroutine library, you may
|
|
||||||
consider it more useful to permit linking proprietary applications with the
|
|
||||||
library. If this is what you want to do, use the GNU Library General
|
|
||||||
Public License instead of this License.
|
|
|
@ -3960,3 +3960,12 @@ Sun Nov 12 12:05:58 PST 2000 Michael Jennings <mej@eterm.org>
|
||||||
can handle MWM hints. This is all raster's fault.
|
can handle MWM hints. This is all raster's fault.
|
||||||
|
|
||||||
-------------------------------------------------------------------------------
|
-------------------------------------------------------------------------------
|
||||||
|
Tue Nov 14 17:17:53 PST 2000 Michael Jennings <mej@eterm.org>
|
||||||
|
|
||||||
|
Since someone wanted it, if no name is given but an exec line (the -e
|
||||||
|
option) is given, the name defaults to the first word in the exec line
|
||||||
|
instead of "Eterm-<version>". For example, Eterm -e ssh foo would get
|
||||||
|
the title "ssh". NOTE: Most Eterm themes already specify a name, so
|
||||||
|
this will not work with those themes.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------------------
|
||||||
|
|
|
@ -138,7 +138,8 @@ AC_CHECK_HEADERS(fcntl.h termios.h \
|
||||||
sys/ioctl.h sys/select.h sys/time.h \
|
sys/ioctl.h sys/select.h sys/time.h \
|
||||||
sys/sockio.h sys/byteorder.h malloc.h \
|
sys/sockio.h sys/byteorder.h malloc.h \
|
||||||
utmpx.h unistd.h bsd/signal.h regex.h \
|
utmpx.h unistd.h bsd/signal.h regex.h \
|
||||||
regexp.h stdarg.h X11/Xmu/Atoms.h)
|
regexp.h stdarg.h X11/Xmu/Atoms.h \
|
||||||
|
X11/Sunkeysym.h)
|
||||||
AC_HEADER_TIME
|
AC_HEADER_TIME
|
||||||
|
|
||||||
dnl# Missing typedefs and replacements
|
dnl# Missing typedefs and replacements
|
||||||
|
|
|
@ -111,7 +111,7 @@ fstate_t *fstate;
|
||||||
unsigned char fstate_idx;
|
unsigned char fstate_idx;
|
||||||
unsigned long Options = (Opt_scrollbar), image_toggles = 0;
|
unsigned long Options = (Opt_scrollbar), image_toggles = 0;
|
||||||
char *theme_dir = NULL, *user_dir = NULL;
|
char *theme_dir = NULL, *user_dir = NULL;
|
||||||
char **rs_execArgs = NULL; /* Args to exec (-e or --exec) */
|
char **rs_exec_args = NULL; /* Args to exec (-e or --exec) */
|
||||||
char *rs_title = NULL; /* Window title */
|
char *rs_title = NULL; /* Window title */
|
||||||
char *rs_iconName = NULL; /* Icon name */
|
char *rs_iconName = NULL; /* Icon name */
|
||||||
char *rs_geometry = NULL; /* Geometry string */
|
char *rs_geometry = NULL; /* Geometry string */
|
||||||
|
@ -354,7 +354,7 @@ static const struct {
|
||||||
OPT_LONG("term-name", "value to use for setting $TERM", &rs_term_name),
|
OPT_LONG("term-name", "value to use for setting $TERM", &rs_term_name),
|
||||||
OPT_LONG("pipe-name", "filename of console pipe to emulate -C", &rs_pipe_name),
|
OPT_LONG("pipe-name", "filename of console pipe to emulate -C", &rs_pipe_name),
|
||||||
OPT_BOOL('C', "console", "grab console messages", &Options, Opt_console),
|
OPT_BOOL('C', "console", "grab console messages", &Options, Opt_console),
|
||||||
OPT_ARGS('e', "exec", "execute a command rather than a shell", &rs_execArgs)
|
OPT_ARGS('e', "exec", "execute a command rather than a shell", &rs_exec_args)
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Print usage information */
|
/* Print usage information */
|
||||||
|
@ -871,26 +871,26 @@ get_options(int argc, char *argv[])
|
||||||
|
|
||||||
register unsigned short k, len = argc - i;
|
register unsigned short k, len = argc - i;
|
||||||
|
|
||||||
rs_execArgs = (char **) MALLOC(sizeof(char *) * (argc - i + 1));
|
rs_exec_args = (char **) MALLOC(sizeof(char *) * (argc - i + 1));
|
||||||
|
|
||||||
for (k = 0; k < len; k++) {
|
for (k = 0; k < len; k++) {
|
||||||
rs_execArgs[k] = STRDUP(argv[k + i]);
|
rs_exec_args[k] = STRDUP(argv[k + i]);
|
||||||
D_OPTIONS(("rs_execArgs[%d] == %s\n", k, rs_execArgs[k]));
|
D_OPTIONS(("rs_exec_args[%d] == %s\n", k, rs_exec_args[k]));
|
||||||
}
|
}
|
||||||
rs_execArgs[k] = (char *) NULL;
|
rs_exec_args[k] = (char *) NULL;
|
||||||
return;
|
return;
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
register unsigned short k;
|
register unsigned short k;
|
||||||
|
|
||||||
rs_execArgs = (char **) MALLOC(sizeof(char *) * (num_words(val_ptr) + 1));
|
rs_exec_args = (char **) MALLOC(sizeof(char *) * (num_words(val_ptr) + 1));
|
||||||
|
|
||||||
for (k = 0; val_ptr; k++) {
|
for (k = 0; val_ptr; k++) {
|
||||||
rs_execArgs[k] = get_word(1, val_ptr);
|
rs_exec_args[k] = get_word(1, val_ptr);
|
||||||
val_ptr = get_pword(2, val_ptr);
|
val_ptr = get_pword(2, val_ptr);
|
||||||
D_OPTIONS(("rs_execArgs[%d] == %s\n", k, rs_execArgs[k]));
|
D_OPTIONS(("rs_exec_args[%d] == %s\n", k, rs_exec_args[k]));
|
||||||
}
|
}
|
||||||
rs_execArgs[k] = (char *) NULL;
|
rs_exec_args[k] = (char *) NULL;
|
||||||
}
|
}
|
||||||
} else if (!strcasecmp(opt, "help")) {
|
} else if (!strcasecmp(opt, "help")) {
|
||||||
usage();
|
usage();
|
||||||
|
@ -990,21 +990,21 @@ get_options(int argc, char *argv[])
|
||||||
k = i + 1;
|
k = i + 1;
|
||||||
}
|
}
|
||||||
D_OPTIONS(("len == %d k == %d\n", len, k));
|
D_OPTIONS(("len == %d k == %d\n", len, k));
|
||||||
rs_execArgs = (char **) MALLOC(sizeof(char *) * len);
|
rs_exec_args = (char **) MALLOC(sizeof(char *) * len);
|
||||||
|
|
||||||
if (k == i) {
|
if (k == i) {
|
||||||
rs_execArgs[0] = STRDUP((char *) (val_ptr));
|
rs_exec_args[0] = STRDUP((char *) (val_ptr));
|
||||||
D_OPTIONS(("rs_execArgs[0] == %s\n", rs_execArgs[0]));
|
D_OPTIONS(("rs_exec_args[0] == %s\n", rs_exec_args[0]));
|
||||||
k++;
|
k++;
|
||||||
} else {
|
} else {
|
||||||
rs_execArgs[0] = STRDUP(argv[k - 1]);
|
rs_exec_args[0] = STRDUP(argv[k - 1]);
|
||||||
D_OPTIONS(("rs_execArgs[0] == %s\n", rs_execArgs[0]));
|
D_OPTIONS(("rs_exec_args[0] == %s\n", rs_exec_args[0]));
|
||||||
}
|
}
|
||||||
for (; k < argc; k++) {
|
for (; k < argc; k++) {
|
||||||
rs_execArgs[k - i] = STRDUP(argv[k]);
|
rs_exec_args[k - i] = STRDUP(argv[k]);
|
||||||
D_OPTIONS(("rs_execArgs[%d] == %s\n", k - i, rs_execArgs[k - i]));
|
D_OPTIONS(("rs_exec_args[%d] == %s\n", k - i, rs_exec_args[k - i]));
|
||||||
}
|
}
|
||||||
rs_execArgs[len - 1] = (char *) NULL;
|
rs_exec_args[len - 1] = (char *) NULL;
|
||||||
return;
|
return;
|
||||||
} else if (opt[pos] == 'h') {
|
} else if (opt[pos] == 'h') {
|
||||||
usage();
|
usage();
|
||||||
|
@ -2427,13 +2427,13 @@ parse_misc(char *buff, void *state)
|
||||||
|
|
||||||
register unsigned short k, n;
|
register unsigned short k, n;
|
||||||
|
|
||||||
RESET_AND_ASSIGN(rs_execArgs, (char **) MALLOC(sizeof(char *) * ((n = num_words(get_pword(2, buff))) + 1)));
|
RESET_AND_ASSIGN(rs_exec_args, (char **) MALLOC(sizeof(char *) * ((n = num_words(get_pword(2, buff))) + 1)));
|
||||||
|
|
||||||
for (k = 0; k < n; k++) {
|
for (k = 0; k < n; k++) {
|
||||||
rs_execArgs[k] = get_word(k + 2, buff);
|
rs_exec_args[k] = get_word(k + 2, buff);
|
||||||
D_OPTIONS(("rs_execArgs[%d] == %s\n", k, rs_execArgs[k]));
|
D_OPTIONS(("rs_exec_args[%d] == %s\n", k, rs_exec_args[k]));
|
||||||
}
|
}
|
||||||
rs_execArgs[n] = (char *) NULL;
|
rs_exec_args[n] = (char *) NULL;
|
||||||
|
|
||||||
} else if (!BEG_STRCASECMP(buff, "cut_chars ")) {
|
} else if (!BEG_STRCASECMP(buff, "cut_chars ")) {
|
||||||
#ifdef CUTCHAR_OPTION
|
#ifdef CUTCHAR_OPTION
|
||||||
|
@ -3591,7 +3591,6 @@ init_defaults(void)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
rs_name = STRDUP(APL_NAME " " VERSION);
|
|
||||||
Options = (Opt_scrollbar | Opt_select_trailing_spaces);
|
Options = (Opt_scrollbar | Opt_select_trailing_spaces);
|
||||||
Xdisplay = NULL;
|
Xdisplay = NULL;
|
||||||
rs_term_name = NULL;
|
rs_term_name = NULL;
|
||||||
|
@ -3662,24 +3661,36 @@ post_parse(void)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* set any defaults not already set */
|
/* set any defaults not already set */
|
||||||
if (!rs_title)
|
if (rs_name == NULL) {
|
||||||
|
if (rs_exec_args != NULL) {
|
||||||
|
rs_name = STRDUP(rs_exec_args[0]);
|
||||||
|
} else {
|
||||||
|
rs_name = STRDUP(APL_NAME " " VERSION);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!rs_title) {
|
||||||
rs_title = rs_name;
|
rs_title = rs_name;
|
||||||
if (!rs_iconName)
|
}
|
||||||
|
if (!rs_iconName) {
|
||||||
rs_iconName = rs_name;
|
rs_iconName = rs_name;
|
||||||
|
}
|
||||||
if ((TermWin.saveLines = rs_saveLines) < 0) {
|
if ((TermWin.saveLines = rs_saveLines) < 0) {
|
||||||
TermWin.saveLines = SAVELINES;
|
TermWin.saveLines = SAVELINES;
|
||||||
}
|
}
|
||||||
/* no point having a scrollbar without having any scrollback! */
|
/* no point having a scrollbar without having any scrollback! */
|
||||||
if (!TermWin.saveLines)
|
if (!TermWin.saveLines) {
|
||||||
Options &= ~Opt_scrollbar;
|
Options &= ~Opt_scrollbar;
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef PRINTPIPE
|
#ifdef PRINTPIPE
|
||||||
if (!rs_print_pipe)
|
if (!rs_print_pipe) {
|
||||||
rs_print_pipe = STRDUP(PRINTPIPE);
|
rs_print_pipe = STRDUP(PRINTPIPE);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
#ifdef CUTCHAR_OPTION
|
#ifdef CUTCHAR_OPTION
|
||||||
if (!rs_cutchars)
|
if (!rs_cutchars) {
|
||||||
rs_cutchars = STRDUP(CUTCHARS);
|
rs_cutchars = STRDUP(CUTCHARS);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef NO_BOLDFONT
|
#ifndef NO_BOLDFONT
|
||||||
|
@ -4702,10 +4713,10 @@ save_config(char *path, unsigned char save_theme)
|
||||||
fprintf(fp, " border_width %d\n", TermWin.internalBorder);
|
fprintf(fp, " border_width %d\n", TermWin.internalBorder);
|
||||||
fprintf(fp, " term_name %s\n", getenv("TERM"));
|
fprintf(fp, " term_name %s\n", getenv("TERM"));
|
||||||
fprintf(fp, " debug %d\n", DEBUG_LEVEL);
|
fprintf(fp, " debug %d\n", DEBUG_LEVEL);
|
||||||
if (save_theme && rs_execArgs) {
|
if (save_theme && rs_exec_args) {
|
||||||
fprintf(fp, " exec ");
|
fprintf(fp, " exec ");
|
||||||
for (i = 0; rs_execArgs[i]; i++) {
|
for (i = 0; rs_exec_args[i]; i++) {
|
||||||
fprintf(fp, "'%s' ", rs_execArgs[i]);
|
fprintf(fp, "'%s' ", rs_exec_args[i]);
|
||||||
}
|
}
|
||||||
fprintf(fp, "\n");
|
fprintf(fp, "\n");
|
||||||
}
|
}
|
||||||
|
|
|
@ -200,7 +200,7 @@ extern fstate_t *fstate;
|
||||||
extern unsigned char fstate_idx;
|
extern unsigned char fstate_idx;
|
||||||
extern unsigned long Options, image_toggles;
|
extern unsigned long Options, image_toggles;
|
||||||
extern char *theme_dir, *user_dir;
|
extern char *theme_dir, *user_dir;
|
||||||
extern char **rs_execArgs; /* Args to exec (-e or --exec) */
|
extern char **rs_exec_args; /* Args to exec (-e or --exec) */
|
||||||
extern char *rs_title; /* Window title */
|
extern char *rs_title; /* Window title */
|
||||||
extern char *rs_iconName; /* Icon name */
|
extern char *rs_iconName; /* Icon name */
|
||||||
extern char *rs_geometry; /* Geometry string */
|
extern char *rs_geometry; /* Geometry string */
|
||||||
|
|
|
@ -282,7 +282,7 @@ eterm_bootstrap(int argc, char *argv[])
|
||||||
putenv("ETERM_VERSION=" VERSION);
|
putenv("ETERM_VERSION=" VERSION);
|
||||||
|
|
||||||
D_CMD(("init_command()\n"));
|
D_CMD(("init_command()\n"));
|
||||||
init_command(rs_execArgs);
|
init_command(rs_exec_args);
|
||||||
|
|
||||||
main_loop();
|
main_loop();
|
||||||
|
|
||||||
|
|
19
src/term.c
19
src/term.c
|
@ -30,6 +30,9 @@ static const char cvs_ident[] = "$Id$";
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
|
#ifdef HAVE_X11_SUNKEYSYM_H
|
||||||
|
# include <X11/Sunkeysym.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "actions.h"
|
#include "actions.h"
|
||||||
#include "buttons.h"
|
#include "buttons.h"
|
||||||
|
@ -293,6 +296,22 @@ lookup_key(XEvent * ev)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef HAVE_X11_SUNKEYSYM_H
|
||||||
|
switch (keysym) {
|
||||||
|
case SunXK_Copy:
|
||||||
|
case SunXK_Cut:
|
||||||
|
break;
|
||||||
|
case SunXK_Paste:
|
||||||
|
selection_request(ev->xkey.time, ev->xkey.x, ev->xkey.y);
|
||||||
|
LK_RET();
|
||||||
|
break;
|
||||||
|
case SunXK_Front:
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
if (shft) {
|
if (shft) {
|
||||||
/* Shift + F1 - F10 generates F11 - F20 */
|
/* Shift + F1 - F10 generates F11 - F20 */
|
||||||
if (keysym >= XK_F1 && keysym <= XK_F10) {
|
if (keysym >= XK_F1 && keysym <= XK_F10) {
|
||||||
|
|
|
@ -69,7 +69,7 @@ begin main
|
||||||
# if +, bottom right if -
|
# if +, bottom right if -
|
||||||
# geometry 132x50+100+100
|
# geometry 132x50+100+100
|
||||||
# title %appname()
|
# title %appname()
|
||||||
name %appname()
|
# name %appname()
|
||||||
# iconname Eterm
|
# iconname Eterm
|
||||||
|
|
||||||
# Set the fonts. These must be monospace fonts. The values shown are
|
# Set the fonts. These must be monospace fonts. The values shown are
|
||||||
|
|
|
@ -69,7 +69,7 @@ begin main
|
||||||
# if +, bottom right if -
|
# if +, bottom right if -
|
||||||
# geometry 132x50+100+100
|
# geometry 132x50+100+100
|
||||||
# title %appname()
|
# title %appname()
|
||||||
name %appname()
|
# name %appname()
|
||||||
# iconname Eterm
|
# iconname Eterm
|
||||||
|
|
||||||
# Set the fonts. These must be monospace fonts. The values shown are
|
# Set the fonts. These must be monospace fonts. The values shown are
|
||||||
|
|
|
@ -68,7 +68,7 @@ begin main
|
||||||
# if +, bottom right if -
|
# if +, bottom right if -
|
||||||
# geometry 132x50+100+100
|
# geometry 132x50+100+100
|
||||||
title %appname() -- cEterm Theme
|
title %appname() -- cEterm Theme
|
||||||
name %appname()
|
# name %appname()
|
||||||
# iconname Eterm
|
# iconname Eterm
|
||||||
|
|
||||||
# Set the fonts. These must be monospace fonts. The values shown are
|
# Set the fonts. These must be monospace fonts. The values shown are
|
||||||
|
|
Loading…
Reference in New Issue