From ac87c2920d46ccec9e020a5b22ef856eb3db3d6a Mon Sep 17 00:00:00 2001 From: pcg Date: Thu, 8 Apr 2004 20:31:45 +0000 Subject: [PATCH] *** empty log message *** --- Changes | 5 +++ doc/yodl/versioninfo.yo | 2 +- src/command.C | 68 ++++++++++++++++++++--------------------- src/defaultfont.C | 2 +- src/encoding.C | 22 +++++++++++++ src/init.C | 2 +- src/logging.C | 3 +- src/main.C | 4 +-- src/menubar.C | 3 +- src/misc.C | 2 +- src/netdisp.C | 2 +- src/ptytty.C | 3 +- src/rxvt.C | 25 +++++++++++++-- src/rxvtc.C | 24 ++++++++++++++- src/rxvtcolor.C | 22 +++++++++++++ src/rxvtd.C | 24 ++++++++++++++- src/rxvtdaemon.C | 22 +++++++++++++ src/salloc.C | 22 +++++++++++++ src/screen.C | 32 ++++++++++--------- src/scrollbar-next.C | 3 +- src/scrollbar-plain.C | 3 +- src/scrollbar-rxvt.C | 3 +- src/scrollbar-xterm.C | 3 +- src/scrollbar.C | 3 +- src/strings.C | 4 +-- src/version.h | 10 +++--- src/xdefaults.C | 4 +-- src/xpm.C | 3 +- 28 files changed, 247 insertions(+), 78 deletions(-) diff --git a/Changes b/Changes index 5cd9d6a9..20f4f2f0 100644 --- a/Changes +++ b/Changes @@ -2,6 +2,11 @@ Lines marked with "xterm:" indicate either xterm features ported to rxvt or changed rxvt behaviour to make it more compatible to xterm (usually xfree86's xterm). +2.8 Thu Apr 8 22:44:36 CEST 2004 + - replace PF_LOCAL by PF_UNIX (portability). + - try to detect -lnsl and -lsocket (portability). + - fix some minor bugs. + 2.7 Mon Apr 5 02:11:15 CEST 2004 - this version should now work fine with TERM=xterm. - don't leave the X or rxvtd sockets open in child processes. diff --git a/doc/yodl/versioninfo.yo b/doc/yodl/versioninfo.yo index 38fcb253..3003a0d5 100644 --- a/doc/yodl/versioninfo.yo +++ b/doc/yodl/versioninfo.yo @@ -1,4 +1,4 @@ -COMMENT(-- $Id: versioninfo.yo,v 1.11 2004-04-05 15:54:23 pcg Exp $ --) +COMMENT(-- $Id: versioninfo.yo,v 1.12 2004-04-08 20:34:43 pcg Exp $ --) DEFINEMACRO(RXVTNAME)(0) (rxvt) DEFINEMACRO(RXVTDATE)(0) diff --git a/src/command.C b/src/command.C index da765d20..1ad4771e 100644 --- a/src/command.C +++ b/src/command.C @@ -1,5 +1,5 @@ /*--------------------------------*-C-*---------------------------------* - * File: command.c + * File: command.C *----------------------------------------------------------------------* * * All portions of code are copyright by their respective author/s. @@ -674,7 +674,6 @@ rxvt_term::flush () #ifdef USE_XIM IMSendSpot (); #endif - } display->flush (); @@ -718,6 +717,12 @@ rxvt_term::pty_fill () { ssize_t n = cmdbuf_endp - cmdbuf_ptr; + if (CBUFSIZ == n) + { + rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); + n = 0; + } + memmove (cmdbuf_base, cmdbuf_ptr, n); cmdbuf_ptr = cmdbuf_base; cmdbuf_endp = cmdbuf_ptr + n; @@ -744,23 +749,10 @@ rxvt_term::pty_cb (io_watcher &w, short revents) if (revents & EVENT_WRITE) tt_write (0, 0); else if (revents & EVENT_READ) - { - // loop, but don't allow a single term to monopolize us - // the number of loops is fully arbitrary, and thus wrong - while (pty_fill ()) - { - if (!seen_input) - { - seen_input = 1; - /* once we know the shell is running, send the screen size. Again! */ - // I don't know why, btw. - tt_winch (); - } - - if (cmd_parse ()) - break; - } - } + // loop, but don't allow a single term to monopolize us + while (pty_fill ()) + if (cmd_parse ()) + break; } #ifdef POINTER_BLANK @@ -1015,10 +1007,10 @@ rxvt_term::x_cb (XEvent &ev) || ev.xclient.data.l[0] == DndLink)) { /* Get Dnd data */ - Atom ActualType; - int ActualFormat; - unsigned char *data; - unsigned long Size, RemainingBytes; + Atom ActualType; + int ActualFormat; + unsigned char *data; + unsigned long Size, RemainingBytes; XGetWindowProperty (display->display, display->root, xa[XA_DNDSELECTION], @@ -1031,6 +1023,7 @@ rxvt_term::x_cb (XEvent &ev) XA_CUT_BUFFER0, XA_STRING, 8, PropModeReplace, data, STRLEN (data)); + XFree (data); selection_paste (display->root, XA_CUT_BUFFER0, True); XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); } @@ -1998,7 +1991,7 @@ rxvt_term::check_our_parents () else { have_pixmap = 1; - rootpixmap = * ((Pixmap *)prop); + rootpixmap = *(Pixmap *)prop; XFree (prop); } @@ -2193,7 +2186,7 @@ rxvt_term::cmd_parse () if (ch == NOCHAR) // TODO: improve break; - if (!IS_CONTROL (ch) || ch == '\t' || ch == '\n' || ch == '\r') + if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) { /* Read a text string from the input buffer */ unicode_t buf[UBUFSIZ]; @@ -2208,12 +2201,12 @@ rxvt_term::cmd_parse () seq_begin = cmdbuf_ptr; ch = next_char (); - if (ch == NOCHAR || (IS_CONTROL (ch) && ch != '\t' && ch != '\n' && ch != '\r')) + if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) break; *str++ = ch; - if (ch == '\n') + if (ch == C0_LF) { nlines++; refresh_count++; @@ -2258,8 +2251,8 @@ rxvt_term::cmd_parse () { if ((Options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) refresh_limit++; - - scr_refresh (refresh_type); + else + scr_refresh (refresh_type); } } @@ -2599,7 +2592,7 @@ rxvt_term::process_escape_seq () /* 8.3.87: NEXT LINE */ case C1_NEL: /* ESC E */ { - unicode_t nlcr[] = { L'\n', L'\r' }; + unicode_t nlcr[] = { C0_LF, C0_CR }; scr_add_lines (nlcr, 1, 2); } break; @@ -3094,7 +3087,7 @@ rxvt_term::process_window_ops (const int *args, unsigned int nargs) /*----------------------------------------------------------------------*/ /* * get input up until STRING TERMINATOR (or BEL) - * ends_how is terminator used. returned input must be free ()d + * ends_how is terminator used. returned input must be free()'d */ unsigned char * rxvt_term::get_to_st (unicode_t &ends_how) @@ -3121,9 +3114,9 @@ rxvt_term::get_to_st (unicode_t &ends_how) seen_esc = 1; continue; } - else if (ch == '\t') + else if (ch == C0_HT) ch = ' '; /* translate '\t' to space */ - else if (ch < 0x20 && (ch != 0x0a && ch != 0x0d)) + else if (ch < 0x20 && (ch != C0_LF && ch != C0_CR)) return NULL; /* other control character - exit */ if (n >= sizeof (string) - 1) @@ -3702,12 +3695,19 @@ rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) case 5: rendset = 1, rendstyle = RS_Blink; break; + //case 6: // scoansi light background case 7: rendset = 1, rendstyle = RS_RVid; break; case 8: // invisible. NYI break; + //case 10: // scoansi acs off + //case 11: // scoansi acs on + //case 12: // scoansi acs on, |0x80 + case 21: // disable bold, blink and invis (some terminals use this) + rendset = 0, rendstyle = RS_Bold | RS_Blink; + break; case 22: rendset = 0, rendstyle = RS_Bold; break; @@ -3809,7 +3809,7 @@ rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) } /*}}} */ -/*{{{ process Rob Nation's own graphics mode sequences */ +/*{{{ (do not) process Rob Nation's own graphics mode sequences */ void rxvt_term::process_graphics () { diff --git a/src/defaultfont.C b/src/defaultfont.C index 6eb9c7f0..56d1b4f5 100644 --- a/src/defaultfont.C +++ b/src/defaultfont.C @@ -1,4 +1,4 @@ -/*--------------------------------*-C-*---------------------------------*; +/*--------------------------------*-C-*---------------------------------* * File: defaultfont.C *----------------------------------------------------------------------* * Copyright (c) 2003-2004 Marc Lehmann diff --git a/src/encoding.C b/src/encoding.C index 59de1ff0..972b12d0 100644 --- a/src/encoding.C +++ b/src/encoding.C @@ -1,3 +1,25 @@ +/*--------------------------------*-C-*---------------------------------* + * File: encoding.C + *----------------------------------------------------------------------* + * + * All portions of code are copyright by their respective author/s. + * Copyright (c) 2003-2004 Marc Lehmann + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + *----------------------------------------------------------------------*/ + #include "../config.h" #include "encoding.h" diff --git a/src/init.C b/src/init.C index 789b0ffc..27ecb1b0 100644 --- a/src/init.C +++ b/src/init.C @@ -1,5 +1,5 @@ /*--------------------------------*-C-*---------------------------------* - * File: init.c + * File: init.C *----------------------------------------------------------------------* * * All portions of code are copyright by their respective author/s. diff --git a/src/logging.C b/src/logging.C index f6d19adb..fd7d2fc4 100644 --- a/src/logging.C +++ b/src/logging.C @@ -1,5 +1,5 @@ /*--------------------------------*-C-*---------------------------------* - * File: logging.c + * File: logging.C *----------------------------------------------------------------------* * * All portions of code are copyright by their respective author/s. @@ -14,6 +14,7 @@ * - extensive modifications * Copyright (c) 1999 D J Hawkey Jr * - lastlog support + * Copyright (c) 2004 Marc Lehmann * * 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 diff --git a/src/main.C b/src/main.C index a87fc23e..415e94fe 100644 --- a/src/main.C +++ b/src/main.C @@ -1,5 +1,5 @@ -/*--------------------------------*-C-*---------------------------------*; - * File: main.c +/*--------------------------------*-C-*---------------------------------* + * File: main.C *----------------------------------------------------------------------* * * All portions of code are copyright by their respective author/s. diff --git a/src/menubar.C b/src/menubar.C index bd404dc7..c7040b8b 100644 --- a/src/menubar.C +++ b/src/menubar.C @@ -1,8 +1,9 @@ /*--------------------------------*-C-*---------------------------------* - * File: menubar.c + * File: menubar.C *----------------------------------------------------------------------* * * Copyright (c) 1997,1998 mj olesen + * Copyright (c) 2004 Marc Lehmann * * 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 diff --git a/src/misc.C b/src/misc.C index f11227d9..71441560 100644 --- a/src/misc.C +++ b/src/misc.C @@ -1,5 +1,5 @@ /*--------------------------------*-C-*---------------------------------* - * File: misc.c + * File: misc.C *----------------------------------------------------------------------* * * All portions of code are copyright by their respective author/s. diff --git a/src/netdisp.C b/src/netdisp.C index ec29850d..c36b9a47 100644 --- a/src/netdisp.C +++ b/src/netdisp.C @@ -1,5 +1,5 @@ /*--------------------------------*-C-*---------------------------------* - * File: netdisp.c + * File: netdisp.C *----------------------------------------------------------------------* * * All portions of code are copyright by their respective author/s. diff --git a/src/ptytty.C b/src/ptytty.C index 61cd352d..5b07c8db 100644 --- a/src/ptytty.C +++ b/src/ptytty.C @@ -1,9 +1,10 @@ /*--------------------------------*-C-*---------------------------------* - * File: ptytty.c + * File: ptytty.C *----------------------------------------------------------------------* * * All portions of code are copyright by their respective author/s. * Copyright (c) 1999-2001 Geoff Wing + * Copyright (c) 2004 Marc Lehmann * * 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 diff --git a/src/rxvt.C b/src/rxvt.C index 68bc1d5d..f0009d01 100644 --- a/src/rxvt.C +++ b/src/rxvt.C @@ -1,8 +1,28 @@ +/*--------------------------------*-C-*---------------------------------* + * File: rxvt.C + *----------------------------------------------------------------------* + * + * All portions of code are copyright by their respective author/s. + * Copyright (c) 2003-2004 Marc Lehmann + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + *----------------------------------------------------------------------*/ + #include "../config.h" #include "rxvt.h" -/*----------------------------------------------------------------------*/ -/* main () */ int main (int argc, const char *const *argv) try @@ -22,3 +42,4 @@ catch (const class rxvt_failure_exception &e) { return EXIT_FAILURE; } + diff --git a/src/rxvtc.C b/src/rxvtc.C index 39807b1f..3ff1ba3c 100644 --- a/src/rxvtc.C +++ b/src/rxvtc.C @@ -1,3 +1,25 @@ +/*--------------------------------*-C-*---------------------------------* + * File: rxvtc.C + *----------------------------------------------------------------------* + * + * All portions of code are copyright by their respective author/s. + * Copyright (c) 2003-2004 Marc Lehmann + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + *----------------------------------------------------------------------*/ + #include "../config.h" #include "rxvtdaemon.h" @@ -17,7 +39,7 @@ struct client : rxvt_connection { client::client () { - if ((fd = socket (PF_LOCAL, SOCK_STREAM, 0)) < 0) + if ((fd = socket (PF_UNIX, SOCK_STREAM, 0)) < 0) { perror ("unable to create communications socket"); exit (EXIT_FAILURE); diff --git a/src/rxvtcolor.C b/src/rxvtcolor.C index 30cb10e4..596423c7 100644 --- a/src/rxvtcolor.C +++ b/src/rxvtcolor.C @@ -1,3 +1,25 @@ +/*--------------------------------*-C-*---------------------------------* + * File: rxvtcolor.C + *----------------------------------------------------------------------* + * + * All portions of code are copyright by their respective author/s. + * Copyright (c) 2003-2004 Marc Lehmann + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + *----------------------------------------------------------------------*/ + #include "../config.h" #include #include diff --git a/src/rxvtd.C b/src/rxvtd.C index f0330ffc..29216189 100644 --- a/src/rxvtd.C +++ b/src/rxvtd.C @@ -1,3 +1,25 @@ +/*--------------------------------*-C-*---------------------------------* + * File: rxvtd.C + *----------------------------------------------------------------------* + * + * All portions of code are copyright by their respective author/s. + * Copyright (c) 2003-2004 Marc Lehmann + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + *----------------------------------------------------------------------*/ + #include "../config.h" #include "rxvt.h" #include "rxvtdaemon.h" @@ -47,7 +69,7 @@ struct unix_listener { unix_listener::unix_listener (const char *sockname) : accept_ev (this, &unix_listener::accept_cb) { - if ((fd = socket (PF_LOCAL, SOCK_STREAM, 0)) < 0) + if ((fd = socket (PF_UNIX, SOCK_STREAM, 0)) < 0) { perror ("unable to create listening socket"); exit (EXIT_FAILURE); diff --git a/src/rxvtdaemon.C b/src/rxvtdaemon.C index a9cb7856..f51a1a41 100644 --- a/src/rxvtdaemon.C +++ b/src/rxvtdaemon.C @@ -1,3 +1,25 @@ +/*--------------------------------*-C-*---------------------------------* + * File: rxvtdaemon.C + *----------------------------------------------------------------------* + * + * All portions of code are copyright by their respective author/s. + * Copyright (c) 2003-2004 Marc Lehmann + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + *----------------------------------------------------------------------*/ + #include #include #include diff --git a/src/salloc.C b/src/salloc.C index c9708222..8e12d992 100644 --- a/src/salloc.C +++ b/src/salloc.C @@ -1,3 +1,25 @@ +/*--------------------------------*-C-*---------------------------------* + * File: salloc.C + *----------------------------------------------------------------------* + * + * All portions of code are copyright by their respective author/s. + * Copyright (c) 2003-2004 Marc Lehmann + * + * 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., 675 Mass Ave, Cambridge, MA 02139, USA. + *----------------------------------------------------------------------*/ + #include "salloc.h" #define SALLOC_BLOCK 65536 // size of basic block to allocate diff --git a/src/screen.C b/src/screen.C index f4e2b4a3..c10449f2 100644 --- a/src/screen.C +++ b/src/screen.C @@ -1,5 +1,5 @@ /*--------------------------------*-C-*--------------------------------------* - * File: screen.c + * File: screen.C *---------------------------------------------------------------------------* * * Copyright (c) 1997-2001 Geoff Wing @@ -513,6 +513,7 @@ rxvt_term::scr_cursor (int mode) s->s_charset = s->charset; s->s_charset_char = charsets[s->charset]; break; + case RESTORE: want_refresh = 1; s->cur.row = s->s_cur.row; @@ -812,11 +813,11 @@ rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) if (c < 0x20) switch (c) { - case '\t': + case C0_HT: scr_tab (1); continue; - case '\n': + case C0_LF: if (screen.tlen[row] != -1) /* XXX: think about this */ MAX_IT (screen.tlen[row], screen.cur.col); @@ -831,7 +832,7 @@ rxvt_term::scr_add_lines (const unicode_t *str, int nlines, int len) srp = screen.rend[row]; /* _must_ refresh */ continue; - case '\r': + case C0_CR: if (screen.tlen[row] != -1) /* XXX: think about this */ MAX_IT (screen.tlen[row], screen.cur.col); @@ -989,6 +990,7 @@ void rxvt_term::scr_backspace () { want_refresh = 1; + if (screen.cur.col == 0) { if (screen.cur.row > 0) @@ -1003,6 +1005,7 @@ rxvt_term::scr_backspace () } else if ((screen.flags & Screen_WrapNext) == 0) scr_gotorc (0, -1, RELATIVE); + screen.flags &= ~Screen_WrapNext; } @@ -1116,8 +1119,7 @@ rxvt_term::scr_gotorc (int row, int col, int relative) D_SCREEN ((stderr, "rxvt_scr_gotorc (r:%s%d,c:%s%d): from (r:%d,c:%d)", (relative & R_RELATIVE ? "+" : ""), row, (relative & C_RELATIVE ? "+" : ""), col, screen.cur.row, screen.cur.col)); - screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) - : col); + screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; MAX_IT (screen.cur.col, 0); MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1); @@ -1166,7 +1168,7 @@ rxvt_term::scr_gotorc (int row, int col, int relative) void rxvt_term::scr_index (enum page_dirn direction) { - int dirn; + int dirn; want_refresh = 1; dirn = ((direction == UP) ? 1 : -1); @@ -1519,6 +1521,7 @@ void rxvt_term::scr_cursor_visible (int mode) { want_refresh = 1; + if (mode) screen.flags |= Screen_VisibleCursor; else @@ -1844,6 +1847,7 @@ rxvt_term::scr_changeview (uint16_t oldviewstart) want_refresh = 1; num_scr -= (TermWin.view_start - oldviewstart); } + return (int) (TermWin.view_start - oldviewstart); } @@ -2519,8 +2523,8 @@ rxvt_term::paste (const unsigned char *data, unsigned int len) MEMCPY (ds, data + i, n); for (j = 0; j < n; j++) - if (ds[j] == '\n') - ds[j] = '\r'; + if (ds[j] == C0_LF) + ds[j] = C0_CR; tt_write (ds, (int)n); } @@ -2881,11 +2885,11 @@ rxvt_term::selection_make (Time tm) } if (screen.tlen[row] != -1 && row != end_row) - new_selection_text[ofs++] = L'\n'; + new_selection_text[ofs++] = C0_LF; } if (end_col != selection.end.col) - new_selection_text[ofs++] = L'\n'; + new_selection_text[ofs++] = C0_LF; new_selection_text[ofs] = 0; @@ -3122,9 +3126,9 @@ rxvt_term::selection_extend (int x, int y, int flag) void rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) { - int16_t ncol = TermWin.ncol; - int end_col; - row_col_t pos; + int16_t ncol = TermWin.ncol; + int end_col; + row_col_t pos; enum { LEFT, RIGHT } closeto = RIGHT; diff --git a/src/scrollbar-next.C b/src/scrollbar-next.C index 212ce1df..99c29da0 100644 --- a/src/scrollbar-next.C +++ b/src/scrollbar-next.C @@ -1,11 +1,12 @@ /*--------------------------------*-C-*---------------------------------* - * File: scrollbar-next.c + * File: scrollbar-next.C *----------------------------------------------------------------------* * * Copyright (c) 1997,1998 mj olesen * Copyright (c) 1998 Alfredo K. Kojima * - N*XTstep like scrollbars * Copyright (c) 1999-2001 Geoff Wing + * Copyright (c) 2004 Marc Lehmann * * 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 diff --git a/src/scrollbar-plain.C b/src/scrollbar-plain.C index ed92fb59..b45d4f16 100644 --- a/src/scrollbar-plain.C +++ b/src/scrollbar-plain.C @@ -1,9 +1,10 @@ /*----------------------------------------------------------------------* - * File: scrollbar-plain.c + * File: scrollbar-plain.C *----------------------------------------------------------------------* * * Copyright (c) 1997,1998 mj olesen * Copyright (c) 1999-2001 Geoff Wing + * Copyright (c) 2004 Marc Lehmann * * 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 diff --git a/src/scrollbar-rxvt.C b/src/scrollbar-rxvt.C index a37890fd..8cce92b3 100644 --- a/src/scrollbar-rxvt.C +++ b/src/scrollbar-rxvt.C @@ -1,9 +1,10 @@ /*--------------------------------*-C-*---------------------------------* - * File: scrollbar-rxvt.c + * File: scrollbar-rxvt.C *----------------------------------------------------------------------* * * Copyright (c) 1997,1998 mj olesen * Copyright (c) 1999-2001 Geoff Wing + * Copyright (c) 2004 Marc Lehmann * * 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 diff --git a/src/scrollbar-xterm.C b/src/scrollbar-xterm.C index 150a80bb..fdd0d222 100644 --- a/src/scrollbar-xterm.C +++ b/src/scrollbar-xterm.C @@ -1,9 +1,10 @@ /*--------------------------------*-C-*---------------------------------* - * File: scrollbar-xterm.c + * File: scrollbar-xterm.C *----------------------------------------------------------------------* * * Copyright (c) 1997,1998 mj olesen * Copyright (c) 1999-2001 Geoff Wing + * Copyright (c) 2004 Marc Lehmann * * 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 diff --git a/src/scrollbar.C b/src/scrollbar.C index 8b5757e2..3cda383e 100644 --- a/src/scrollbar.C +++ b/src/scrollbar.C @@ -1,11 +1,12 @@ /*--------------------------------*-C-*---------------------------------* - * File: scrollbar.c + * File: scrollbar.C *----------------------------------------------------------------------* * * Copyright (c) 1997,1998 mj olesen * Copyright (c) 1998 Alfredo K. Kojima * - N*XTstep like scrollbars * Copyright (c) 1999-2001 Geoff Wing + * Copyright (c) 2004 Marc Lehmann * * 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 diff --git a/src/strings.C b/src/strings.C index a1442446..bb73eabb 100644 --- a/src/strings.C +++ b/src/strings.C @@ -1,10 +1,10 @@ /*--------------------------------*-C-*---------------------------------* - * File: strings.c + * File: strings.C *----------------------------------------------------------------------* - * $Id: strings.C,v 1.5 2004-02-13 12:16:21 pcg Exp $ * * All portions of code are copyright by their respective author/s. * Copyright (c) 1997-2001 Geoff Wing + * Copyright (c) 2004 Marc Lehmann * * 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 diff --git a/src/version.h b/src/version.h index af382af9..053d9250 100644 --- a/src/version.h +++ b/src/version.h @@ -1,5 +1,5 @@ -#define VERSION "2.7" -#define VSTRING "20700" -#define DATE "2004-04-05" -#define LSMDATE "05APR04" -#define LIBVERSION "2:7:0" +#define VERSION "2.8" +#define VSTRING "20800" +#define DATE "2004-04-08" +#define LSMDATE "08APR04" +#define LIBVERSION "2:8:0" diff --git a/src/xdefaults.C b/src/xdefaults.C index 7240f440..aa32668b 100644 --- a/src/xdefaults.C +++ b/src/xdefaults.C @@ -1,12 +1,12 @@ /*--------------------------------*-C-*---------------------------------* - * File: xdefaults.c + * File: xdefaults.C *----------------------------------------------------------------------* - * $Id: xdefaults.C,v 1.23 2004-04-02 18:00:01 pcg Exp $ * * All portions of code are copyright by their respective author/s. * Copyright (c) 1994 Robert Nation * - original version * Copyright (c) 1997,1998 mj olesen + * Copyright (c) 2003-2004 Marc Lehmann * * 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 diff --git a/src/xpm.C b/src/xpm.C index 90b3666a..03367c9e 100644 --- a/src/xpm.C +++ b/src/xpm.C @@ -1,7 +1,6 @@ /*--------------------------------*-C-*---------------------------------* - * File: xpm.c + * File: xpm.C *----------------------------------------------------------------------* - * $Id: xpm.C,v 1.11 2004-04-02 20:41:01 pcg Exp $ * * All portions of code are copyright by their respective author/s. * Copyright (c) 1997 Carsten Haitzler -- 2.34.1