From: pcg Date: Tue, 24 Feb 2004 21:41:15 +0000 (+0000) Subject: *** empty log message *** X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=5b1a8414c5a357133ba8117c1356b021efd59df6;p=dana%2Furxvt.git *** empty log message *** --- diff --git a/Changes b/Changes index 6edb564f..50754793 100644 --- a/Changes +++ b/Changes @@ -19,6 +19,7 @@ - removed greek support. - allow NUL bytes (ctrl-@) to be entered even with XIM enabled. - correct cursor width if !focus. + - fixed --enable-xgetdefault, reported by eduard bloch. - many other minor bugfixes. 1.8 Mon Feb 2 20:09:18 CET 2004 diff --git a/doc/rxvtc.1 b/doc/rxvtc.1 new file mode 100644 index 00000000..f90fa894 --- /dev/null +++ b/doc/rxvtc.1 @@ -0,0 +1,40 @@ +.if !\n(.g .ab GNU tbl requires GNU troff. +.if !dTS .ds TS +.if !dTE .ds TE +.TH "RXVT-UNICODE" "1" "X Version 11" "X Tools" +.SH "NAME" +rxvt (ouR XVT) \- a VT102 emulator for the X window system +.PP +.SH "SYNOPSIS" +.PP +\fBrxvtd\fP +.PP +\fBrxvtc\fP [options] [\-e command [ args ]] +.PP +.SH "DESCRIPTION" +.PP +\fBrxvtd\fP is a colour vt102 terminal +emulator intended as an \fIxterm\fP(1) replacement. \fBrxvtd\fP +implements the actual program that runs runs as daemon in background and +opens pseudo-ttys. You can run it from your X startup scripts, for +example, although it is not dependent on a working DISPLAY and, in fact, +can open windows on multiple X displays. +.PP +\fBrxvtc\fP is the client program of this duo. It connects to the +\fBrxvtd\fP daemon and requests a new terminal window. It +takes the same arguments as the \fBrxvt\fP program. The environment will +also be respected. Currently, it always returns immediately after contacting +the daemon. +.PP +The positive aspect of this client-server solution is faster creation +time for terminal windows and a lot of saved memory. The other side is a +possible impact on stability - if the main program crashes, all +processes in the terminal windows are terminated. At the moment, a single +misspelled option will kill the \fBrxvtd\fP, so this is useful mostly +for automated calls e.g. from your window manager. +.PP +.PP +.SH "SEE ALSO" +.PP +\fIrxvt\fP(1), \fIsh\fP(1), \fI/usr/share/doc/rxvt\-unicode/README.unicode\fP + diff --git a/src/init.C b/src/init.C index de1af4f7..a798e7f0 100644 --- a/src/init.C +++ b/src/init.C @@ -1242,12 +1242,12 @@ rxvt_term::create_windows (int argc, const char *const *argv) if (menuBar_height ()) { menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], - window_vt_x, 0, - TermWin_TotalWidth (), - menuBar_TotalHeight (), - 0, - PixColors[Color_fg], - PixColors[Color_scroll]); + window_vt_x, 0, + TermWin_TotalWidth (), + menuBar_TotalHeight (), + 0, + PixColors[Color_fg], + PixColors[Color_scroll]); #ifdef DEBUG_X XStoreName (display->display, menuBar.win, "menubar"); diff --git a/src/main.C b/src/main.C index cb12af8c..bdbde81c 100644 --- a/src/main.C +++ b/src/main.C @@ -120,13 +120,15 @@ rxvt_term::~rxvt_term () if (display) { - if (TermWin.parent[0]) - XDestroyWindow (display->display, TermWin.parent[0]); #if defined(MENUBAR) && (MENUBAR_MAX > 1) - if (menuBar.win) - XDestroyWindow (display->display, menuBar.win); delete menuBar.drawable; + //if (menuBar.win) + // XDestroyWindow (display->display, menuBar.win); #endif + delete TermWin.drawable; + // destroy all windows + if (TermWin.parent[0]) + XDestroyWindow (display->display, TermWin.parent[0]); } // TODO: free pixcolours, colours should become part of rxvt_display diff --git a/src/xdefaults.C b/src/xdefaults.C index e4f19da9..bd57034f 100644 --- a/src/xdefaults.C +++ b/src/xdefaults.C @@ -1,7 +1,7 @@ /*--------------------------------*-C-*---------------------------------* * File: xdefaults.c *----------------------------------------------------------------------* - * $Id: xdefaults.C,v 1.12 2004-02-22 08:09:38 pcg Exp $ + * $Id: xdefaults.C,v 1.13 2004-02-24 21:41:16 pcg Exp $ * * All portions of code are copyright by their respective author/s. * Copyright (c) 1994 Robert Nation @@ -561,8 +561,13 @@ rxvt_term::get_options (int argc, const char *const *argv) * value will be a string */ /* ARGSUSED */ -bool -rxvt_define_key(XrmDatabase *database __attribute__((unused)), XrmBindingList bindings __attribute__((unused)), XrmQuarkList quarks, XrmRepresentation *type __attribute__((unused)), XrmValue *value, XPointer closure __attribute__((unused))) +int +rxvt_define_key (XrmDatabase *database __attribute__((unused)), + XrmBindingList bindings __attribute__((unused)), + XrmQuarkList quarks, + XrmRepresentation *type __attribute__((unused)), + XrmValue *value, + XPointer closure __attribute__((unused))) { int last; @@ -890,14 +895,14 @@ rxvt_term::extract_resources (Display *display __attribute__ ((unused)), const c class_prefix[2] = NULLQUARK; /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, - XrmEnumOneLevel, rxvt_define_key, NULL); + XrmEnumOneLevel, rxvt_define_key, NULL); name_prefix[0] = XrmStringToName (APL_CLASS); name_prefix[1] = XrmStringToName ("keysym"); class_prefix[0] = XrmStringToName (APL_CLASS); class_prefix[1] = XrmStringToName ("Keysym"); /* XXX: Need to check sizeof (rxvt_t) == sizeof (XPointer) */ XrmEnumerateDatabase (XrmGetDatabase (display), name_prefix, class_prefix, - XrmEnumOneLevel, rxvt_define_key, NULL); + XrmEnumOneLevel, rxvt_define_key, NULL); # endif # endif