ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.54 by pcg, Thu Mar 11 00:53:19 2004 UTC vs.
Revision 1.346 by sf-exg, Mon Jul 26 09:57:53 2010 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.c 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
23/* 23/*
24 * This file handles _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#define INTERN_SCREEN
29#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
30#include "screen.intpro" /* PROTOS for internal routines */ 29#include "rxvtperl.h" /* NECESSARY */
31 30
32#include <X11/Xmd.h> /* get the typedef for CARD32 */
33
34#include <stdint.h> 31#include <inttypes.h>
35#include <wchar.h>
36 32
37#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
38 34
35static inline void
39inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
40{ 37{
41 while (len--) 38 while (len--)
42 *start++ = value; 39 *start++ = value;
43} 40}
44 41
45/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
46#define PROP_SIZE 16384 43#define PROP_SIZE 256*1024
44#define PASTE_SIZE 32768
47#define TABSIZE 8 /* default tab size */ 45#define TABSIZE 8 /* default tab size */
48 46
49/* ------------------------------------------------------------------------- * 47/* ------------------------------------------------------------------------- *
50 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 48 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
51 * ------------------------------------------------------------------------- */ 49 * ------------------------------------------------------------------------- */
52#define ZERO_SCROLLBACK() \ 50#define ZERO_SCROLLBACK() \
53 if ((Options & Opt_scrollTtyOutput) == Opt_scrollTtyOutput) \ 51 if (option (Opt_scrollTtyOutput)) \
54 TermWin.view_start = 0 52 view_start = 0
55#define CLEAR_SELECTION() \ 53#define CLEAR_SELECTION() \
56 selection.beg.row = selection.beg.col \ 54 selection.beg.row = selection.beg.col \
57 = selection.end.row = selection.end.col = 0 55 = selection.end.row = selection.end.col = 0
58#define CLEAR_ALL_SELECTION() \ 56#define CLEAR_ALL_SELECTION() \
59 selection.beg.row = selection.beg.col \ 57 selection.beg.row = selection.beg.col \
60 = selection.mark.row = selection.mark.col \ 58 = selection.mark.row = selection.mark.col \
61 = selection.end.row = selection.end.col = 0 59 = selection.end.row = selection.end.col = 0
62 60
63#define ROW_AND_COL_IS_AFTER(A, B, C, D) \ 61#define ROW_AND_COL_IS_AFTER(A, B, C, D) \
64 (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) 62 (((A) > (C)) || (((A) == (C)) && ((B) > (D))))
65#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ 63#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \
66 (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) 64 (((A) < (C)) || (((A) == (C)) && ((B) < (D))))
67#define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \ 65#define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \
68 (((A) == (C)) && ((B) > (D))) 66 (((A) == (C)) && ((B) > (D)))
69#define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \ 67#define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \
70 (((A) == (C)) && ((B) >= (D))) 68 (((A) == (C)) && ((B) >= (D)))
71#define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \ 69#define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \
72 (((A) == (C)) && ((B) < (D))) 70 (((A) == (C)) && ((B) < (D)))
73#define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \ 71#define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \
74 (((A) == (C)) && ((B) <= (D))) 72 (((A) == (C)) && ((B) <= (D)))
75 73
76/* these must be row_col_t */ 74/* these must be row_col_t */
77#define ROWCOL_IS_AFTER(X, Y) \ 75#define ROWCOL_IS_AFTER(X, Y) \
78 ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col) 76 ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col)
79#define ROWCOL_IS_BEFORE(X, Y) \ 77#define ROWCOL_IS_BEFORE(X, Y) \
80 ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 78 ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
81#define ROWCOL_IN_ROW_AFTER(X, Y) \ 79#define ROWCOL_IN_ROW_AFTER(X, Y) \
82 ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col) 80 ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col)
83#define ROWCOL_IN_ROW_BEFORE(X, Y) \ 81#define ROWCOL_IN_ROW_BEFORE(X, Y) \
84 ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 82 ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
85#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ 83#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \
86 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 84 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
87#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 85#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
88 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 86 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
89 87
90/* 88/*
91 * CLEAR_ROWS : clear <num> rows starting from row <row>
92 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 89 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
93 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
94 */ 90 */
95#define drawBuffer TermWin.vt
96
97#define CLEAR_ROWS(row, num) \
98 if (TermWin.mapped) \
99 XClearArea (display->display, drawBuffer, TermWin.int_bwidth, \
100 Row2Pixel (row), (unsigned int)TermWin.width, \
101 (unsigned int)Height2Pixel (num), False)
102
103#define CLEAR_CHARS(x, y, num) \ 91#define CLEAR_CHARS(x, y, num) \
104 if (TermWin.mapped) \ 92 if (mapped) \
105 XClearArea (display->display, drawBuffer, x, y, \ 93 XClearArea (dpy, vt, x, y, \
106 (unsigned int)Width2Pixel (num), \ 94 (unsigned int)Width2Pixel (num), \
107 (unsigned int)Height2Pixel (1), False) 95 (unsigned int)Height2Pixel (1), False)
108
109#define ERASE_ROWS(row, num) \
110 XFillRectangle (display->display, drawBuffer, TermWin.gc, \
111 TermWin.int_bwidth, Row2Pixel (row), \
112 (unsigned int)TermWin.width, \
113 (unsigned int)Height2Pixel (num))
114 96
115/* ------------------------------------------------------------------------- * 97/* ------------------------------------------------------------------------- *
116 * SCREEN `COMMON' ROUTINES * 98 * SCREEN `COMMON' ROUTINES *
117 * ------------------------------------------------------------------------- */ 99 * ------------------------------------------------------------------------- */
100
118/* Fill part/all of a line with blanks. */ 101/* Fill part/all of a line with blanks. */
119void 102void
120rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) 103rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
121{ 104{
122 efs &= ~RS_baseattrMask; 105 if (!l.t)
106 {
107 lalloc (l);
108 col = 0;
109 width = ncol;
110 }
111
112 l.touch ();
113
114 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
123 efs = SET_FONT (efs, TermWin.fontset->find_font (' ')); 115 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
116
117 text_t *et = l.t + col;
118 rend_t *er = l.r + col;
124 119
125 while (width--) 120 while (width--)
126 { 121 {
127 *et++ = ' '; 122 *et++ = ' ';
128 *er++ = efs; 123 *er++ = efs;
… …
130} 125}
131 126
132/* ------------------------------------------------------------------------- */ 127/* ------------------------------------------------------------------------- */
133/* Fill a full line with blanks - make sure it is allocated first */ 128/* Fill a full line with blanks - make sure it is allocated first */
134void 129void
135rxvt_term::scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs) 130rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
136{ 131{
137#ifdef DEBUG_STRICT 132 scr_blank_line (l, 0, ncol, efs);
138 assert ((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL));
139#endif
140 if (tp[row] == NULL)
141 {
142 tp[row] = (text_t *)talloc->alloc ();
143 rp[row] = (rend_t *)ralloc->alloc ();
144 }
145 133
146 scr_blank_line (tp[row], rp[row], TermWin.ncol, efs); 134 l.l = 0;
135 l.f = 0;
136}
137
138// nuke a single wide character at the given column
139void
140rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
141{
142 // find begin
143 while (col > 0 && l.t[col] == NOCHAR)
144 col--;
145
146 rend_t rend = l.r[col] & ~RS_baseattrMask;
147 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
148
149 // found start, nuke
150 do {
151 l.t[col] = ' ';
152 l.r[col] = rend;
153 col++;
154 } while (col < ncol && l.t[col] == NOCHAR);
147} 155}
148 156
149/* ------------------------------------------------------------------------- * 157/* ------------------------------------------------------------------------- *
150 * SCREEN INITIALISATION * 158 * SCREEN INITIALISATION *
151 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
160
152void 161void
153rxvt_term::scr_reset () 162rxvt_term::scr_reset ()
154{ 163{
155 unsigned int ncol, nrow, total_rows, prev_total_rows;
156 unsigned int p, q;
157 int k;
158 rend_t setrstyle;
159
160 D_SCREEN ((stderr, "rxvt_scr_reset ()"));
161
162 TermWin.view_start = 0; 164 view_start = 0;
163 num_scr = 0; 165 num_scr = 0;
164 166
165 if (TermWin.ncol == 0) 167 if (ncol == 0)
166 TermWin.ncol = 80; 168 ncol = 80;
167 169
168 if (TermWin.nrow == 0) 170 if (nrow == 0)
169 TermWin.nrow = 24; 171 nrow = 24;
170
171 ncol = TermWin.ncol;
172 nrow = TermWin.nrow;
173 172
174 if (ncol == prev_ncol && nrow == prev_nrow) 173 if (ncol == prev_ncol && nrow == prev_nrow)
175 return; 174 return;
176 175
176 // we need at least two lines for wrapping to work correctly
177 while (nrow + saveLines < 2)
178 {
179 //TODO//FIXME
180 saveLines++;
181 prev_nrow--;
182 top_row--;
183 }
184
177 want_refresh = 1; 185 want_refresh = 1;
178 186
187 int prev_total_rows = prev_nrow + saveLines;
179 total_rows = nrow + TermWin.saveLines; 188 total_rows = nrow + saveLines;
180 prev_total_rows = prev_nrow + TermWin.saveLines;
181 189
182 screen.tscroll = 0; 190 screen.tscroll = 0;
183 screen.bscroll = nrow - 1; 191 screen.bscroll = nrow - 1;
184 192
185 if (!talloc) 193 if (!row_buf)
186 { 194 {
195 /*
196 * first time called so just malloc everything: don't rely on realloc
197 */
198 top_row = 0;
199 term_start = 0;
200
187 talloc = new rxvt_salloc (ncol * sizeof (text_t)); 201 talloc = new rxvt_salloc (ncol * sizeof (text_t));
188 ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); 202 ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
189 }
190 203
191 if (prev_nrow == 0) 204 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
192 { 205 drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
193 /* 206 swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t));
194 * first time called so just malloc everything : don't rely on realloc
195 * Note: this is still needed so that all the scrollback lines are NULL
196 */
197 screen.text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
198 buf_text = (text_t **)rxvt_calloc (total_rows, sizeof (text_t *));
199 drawn_text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
200 swap.text = (text_t **)rxvt_calloc (nrow, sizeof (text_t *));
201 207
202 screen.tlen = (int16_t *)rxvt_calloc (total_rows, sizeof (int16_t)); 208 for (int row = nrow; row--; )
203 swap.tlen = (int16_t *)rxvt_calloc (nrow, sizeof (int16_t));
204
205 screen.rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
206 buf_rend = (rend_t **)rxvt_calloc (total_rows, sizeof (rend_t *));
207 drawn_rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
208 swap.rend = (rend_t **)rxvt_calloc (nrow, sizeof (rend_t *));
209
210 for (p = 0; p < nrow; p++)
211 {
212 q = p + TermWin.saveLines;
213 scr_blank_screen_mem (screen.text, screen.rend, q, DEFAULT_RSTYLE);
214 scr_blank_screen_mem (swap.text, swap.rend, p, DEFAULT_RSTYLE);
215 screen.tlen[q] = swap.tlen[p] = 0;
216 scr_blank_screen_mem (drawn_text, drawn_rend, p, DEFAULT_RSTYLE);
217 } 209 {
210 scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE);
211 scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
212 scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
213 }
218 214
219 MEMSET (charsets, 'B', sizeof (charsets)); 215 memset (charsets, 'B', sizeof (charsets));
220 TermWin.nscrolled = 0; /* no saved lines */
221 rstyle = DEFAULT_RSTYLE; 216 rstyle = DEFAULT_RSTYLE;
222 screen.flags = Screen_DefaultFlags; 217 screen.flags = Screen_DefaultFlags;
223 screen.cur.row = screen.cur.col = 0; 218 screen.cur.row = screen.cur.col = 0;
224 screen.charset = 0; 219 screen.charset = 0;
225 current_screen = PRIMARY; 220 current_screen = PRIMARY;
… …
237 selection.text = NULL; 232 selection.text = NULL;
238 selection.len = 0; 233 selection.len = 0;
239 selection.op = SELECTION_CLEAR; 234 selection.op = SELECTION_CLEAR;
240 selection.screen = PRIMARY; 235 selection.screen = PRIMARY;
241 selection.clicks = 0; 236 selection.clicks = 0;
242 CLEAR_ALL_SELECTION (); 237 selection.clip_text = NULL;
243 rvideo = 0; 238 selection.clip_len = 0;
244 } 239 }
245 else 240 else
246 { 241 {
247 /* 242 /*
248 * add or delete rows as appropriate 243 * add or delete rows as appropriate
249 */ 244 */
250 setrstyle = DEFAULT_RSTYLE;
251 245
246 rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t));
247 rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t));
248
249#if 0
252 if (nrow < prev_nrow) 250 if (nrow < prev_nrow)
253 { 251 {
254 /* delete rows */
255 k = min (TermWin.nscrolled, prev_nrow - nrow);
256 scr_scroll_text (0, (int)prev_nrow - 1, k, 1);
257
258 for (p = nrow; p < prev_nrow; p++) 252 for (int row = nrow; row < prev_nrow; row++)
259 { 253 {
260 q = p + TermWin.saveLines; 254 lfree (swap_buf [row]);
261 if (screen.text[q]) 255 lfree (drawn_buf[row]);
256 }
257 }
258#endif
259
260 drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t));
261 swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t));
262
263 for (int row = min (nrow, prev_nrow); row--; )
264 {
265 lresize (drawn_buf[row]);
266 lresize (swap_buf [row]);
267 }
268
269 for (int row = prev_nrow; row < nrow; row++)
270 {
271 swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE);
272 drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE);
273 }
274
275 line_t *old_buf = row_buf;
276 row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
277
278 int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row
279 int pend = MOD (term_start + top_row , prev_total_rows);
280 int q = total_rows; // rewrapped row
281
282 if (top_row)
283 {
284 // Re-wrap lines. This is rather ugly, possibly because I am too dumb
285 // to come up with a lean and mean algorithm.
286 // TODO: maybe optimise when width didn't change
287
288 row_col_t ocur = screen.cur;
289 ocur.row = MOD (term_start + ocur.row, prev_total_rows);
290
291 do
292 {
293 p = MOD (p - 1, prev_total_rows);
294 assert (old_buf [MOD (p, prev_total_rows)].t);
295 int plines = 1;
296 int llen = old_buf [MOD (p, prev_total_rows)].l;
297
298 while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ())
262 { 299 {
263#ifdef DEBUG_STRICT 300 p = MOD (p - 1, prev_total_rows);
264 assert (screen.rend[q]); 301
265#endif 302 plines++;
266 talloc->free (screen.text[q]); 303 llen += prev_ncol;
267 ralloc->free (screen.rend[q]);
268 } 304 }
269 if (swap.text[p]) 305
306 int qlines = max (0, (llen - 1) / ncol) + 1;
307
308 // drop partial lines completely
309 if (q < qlines)
310 break;
311
312 q -= qlines;
313
314 int lofs = 0;
315 line_t *qline;
316
317 // re-assemble the full line by destination lines
318 for (int qrow = q; qlines--; qrow++)
270 { 319 {
271#ifdef DEBUG_STRICT 320 qline = row_buf + qrow;
272 assert (swap.rend[p]); 321 lalloc (*qline);
273#endif 322 qline->l = ncol;
274 talloc->free (swap.text[p]); 323 qline->is_longer (1);
275 ralloc->free (swap.rend[p]); 324
325 int qcol = 0;
326
327 // see below for cursor adjustment rationale
328 if (p == ocur.row)
329 screen.cur.row = q - (total_rows - nrow);
330
331 // fill a single destination line
332 while (lofs < llen && qcol < ncol)
333 {
334 int prow = lofs / prev_ncol;
335 int pcol = lofs % prev_ncol;
336
337 prow = MOD (p + prow, prev_total_rows);
338
339 // we only adjust the cursor _row_ and put it into
340 // the topmost line of "long line" it was in, as
341 // this seems to upset applications/shells/readline
342 // least.
343 if (prow == ocur.row)
344 screen.cur.row = q - (total_rows - nrow);
345
346 line_t &pline = old_buf [prow];
347
348 int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs);
349
350 memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t));
351 memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t));
352
353 lofs += len;
354 qcol += len;
355 }
276 } 356 }
277#ifdef DEBUG_STRICT 357
278 assert (drawn_text[p] && drawn_rend[p]); 358 qline->l = llen ? MOD (llen - 1, ncol) + 1 : 0;
279#endif 359 qline->is_longer (0);
280 talloc->free (drawn_text[p]); 360 scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE);
281 ralloc->free (drawn_rend[p]);
282 } 361 }
362 while (p != pend && q > 0);
283 363
284 /* we have fewer rows so fix up cursor position */ 364 term_start = total_rows - nrow;
285 MIN_IT (screen.cur.row, (int32_t)nrow - 1); 365 top_row = q - term_start;
286 MIN_IT (swap.cur.row, (int32_t)nrow - 1);
287 366
288 scr_reset_realloc (); /* realloc _last_ */ 367 // make sure all terminal lines exist
289 } 368 while (top_row > 0)
290 else if (nrow > prev_nrow) 369 scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
291 { 370 }
292 /* add rows */ 371 else
293 scr_reset_realloc (); /* realloc _first_ */ 372 {
373 // if no scrollback exists (yet), wing, instead of wrap
294 374
295 TermWin.ncol = prev_ncol; // save b/c scr_blank_screen_mem uses this 375 for (int row = min (nrow, prev_nrow); row--; )
296
297 k = min (TermWin.nscrolled, nrow - prev_nrow);
298
299 for (p = prev_total_rows; p < total_rows; p++)
300 { 376 {
301 screen.tlen[p] = 0; 377 line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
302 screen.text[p] = NULL; 378 line_t &qline = row_buf [row];
303 screen.rend[p] = NULL; 379
380 qline = pline;
381 lresize (qline);
304 } 382 }
305 383
306 for (p = prev_total_rows; p < total_rows - k; p++)
307 scr_blank_screen_mem (screen.text, screen.rend, p, setrstyle);
308
309 for (p = prev_nrow; p < nrow; p++) 384 for (int row = prev_nrow; row < nrow; row++)
310 { 385 {
311 swap.tlen[p] = 0; 386 row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE);
312 swap.text[p] = NULL;
313 swap.rend[p] = NULL;
314 drawn_text[p] = NULL;
315 drawn_rend[p] = NULL;
316 scr_blank_screen_mem (swap.text, swap.rend, p, setrstyle);
317 scr_blank_screen_mem (drawn_text, drawn_rend, p, setrstyle);
318 } 387 }
319 388
320 if (k > 0) 389 term_start = 0;
321 {
322 scr_scroll_text (0, (int)nrow - 1, -k, 1);
323 screen.cur.row += k;
324 screen.s_cur.row += k;
325 TermWin.nscrolled -= k;
326 }
327#ifdef DEBUG_STRICT
328 assert (screen.cur.row < TermWin.nrow);
329 assert (swap.cur.row < TermWin.nrow);
330#else /* drive with your eyes closed */
331
332 MIN_IT (screen.cur.row, nrow - 1);
333 MIN_IT (swap.cur.row, nrow - 1);
334#endif
335 TermWin.ncol = ncol; // save b/c scr_blank_screen_mem uses this
336 }
337
338 /* resize columns */
339 if (ncol != prev_ncol)
340 { 390 }
341 int common = min (prev_ncol, ncol);
342 rxvt_salloc *ta = new rxvt_salloc (ncol * sizeof (text_t));
343 rxvt_salloc *ra = new rxvt_salloc (ncol * sizeof (rend_t));
344 391
345 for (p = 0; p < total_rows; p++) 392 free (old_buf);
346 { 393 delete old_ta;
347 if (screen.text[p]) 394 delete old_ra;
348 {
349 text_t *t = (text_t *)ta->alloc (); memcpy (t, screen.text[p], common * sizeof (text_t)); screen.text[p] = t;
350 rend_t *r = (rend_t *)ra->alloc (); memcpy (r, screen.rend[p], common * sizeof (rend_t)); screen.rend[p] = r;
351 395
352 MIN_IT (screen.tlen[p], (int16_t)ncol); 396 clamp_it (screen.cur.row, 0, nrow - 1);
397 clamp_it (screen.cur.col, 0, ncol - 1);
398 }
353 399
354 if (ncol > prev_ncol)
355 scr_blank_line (& (screen.text[p][prev_ncol]),
356 & (screen.rend[p][prev_ncol]),
357 ncol - prev_ncol,
358 setrstyle);
359 }
360 }
361
362 for (p = 0; p < nrow; p++)
363 {
364 text_t *t = (text_t *)ta->alloc (); memcpy (t, drawn_text[p], common * sizeof (text_t)); drawn_text[p] = t;
365 rend_t *r = (rend_t *)ra->alloc (); memcpy (r, drawn_rend[p], common * sizeof (rend_t)); drawn_rend[p] = r;
366
367 if (ncol > prev_ncol)
368 scr_blank_line (& (drawn_text[p][prev_ncol]),
369 & (drawn_rend[p][prev_ncol]),
370 ncol - prev_ncol, setrstyle);
371
372 if (swap.text[p])
373 {
374 text_t *t = (text_t *)ta->alloc (); memcpy (t, swap.text[p], common * sizeof (text_t)); swap.text[p] = t;
375 rend_t *r = (rend_t *)ra->alloc (); memcpy (r, swap.rend[p], common * sizeof (rend_t)); swap.rend[p] = r;
376
377 MIN_IT (swap.tlen[p], (int16_t)ncol);
378
379 if (ncol > prev_ncol)
380 scr_blank_line (& (swap.text[p][prev_ncol]),
381 & (swap.rend[p][prev_ncol]),
382 ncol - prev_ncol, setrstyle);
383 }
384
385 }
386
387 MIN_IT (screen.cur.col, (int16_t)ncol - 1);
388 MIN_IT (swap.cur.col, (int16_t)ncol - 1);
389
390 delete talloc; talloc = ta;
391 delete ralloc; ralloc = ra;
392 }
393
394 if (tabs)
395 free (tabs); 400 free (tabs);
396 } 401 tabs = (char *)rxvt_malloc (ncol);
402
403 for (int col = ncol; --col; )
404 tabs [col] = col % TABSIZE == 0;
405
406 CLEAR_ALL_SELECTION ();
397 407
398 prev_nrow = nrow; 408 prev_nrow = nrow;
399 prev_ncol = ncol; 409 prev_ncol = ncol;
400 410
401 tabs = (char *)rxvt_malloc (ncol * sizeof (char));
402
403 for (p = 0; p < ncol; p++)
404 tabs[p] = (p % TABSIZE == 0) ? 1 : 0;
405
406 tt_winch (); 411 tt_winch ();
407}
408 412
409void 413 HOOK_INVOKE ((this, HOOK_RESET, DT_END));
410rxvt_term::scr_reset_realloc ()
411{
412 uint16_t total_rows, nrow;
413
414 nrow = TermWin.nrow;
415 total_rows = nrow + TermWin.saveLines;
416 /* *INDENT-OFF* */
417 screen.text = (text_t **)rxvt_realloc (screen.text, total_rows * sizeof (text_t *));
418 buf_text = (text_t **)rxvt_realloc (buf_text , total_rows * sizeof (text_t *));
419 drawn_text = (text_t **)rxvt_realloc (drawn_text , nrow * sizeof (text_t *));
420 swap.text = (text_t **)rxvt_realloc (swap.text , nrow * sizeof (text_t *));
421
422 screen.tlen = (int16_t *)rxvt_realloc (screen.tlen, total_rows * sizeof (int16_t));
423 swap.tlen = (int16_t *)rxvt_realloc (swap.tlen , total_rows * sizeof (int16_t));
424
425 screen.rend = (rend_t **)rxvt_realloc (screen.rend, total_rows * sizeof (rend_t *));
426 buf_rend = (rend_t **)rxvt_realloc (buf_rend , total_rows * sizeof (rend_t *));
427 drawn_rend = (rend_t **)rxvt_realloc (drawn_rend , nrow * sizeof (rend_t *));
428 swap.rend = (rend_t **)rxvt_realloc (swap.rend , nrow * sizeof (rend_t *));
429 /* *INDENT-ON* */
430} 414}
431 415
432/* ------------------------------------------------------------------------- */ 416/* ------------------------------------------------------------------------- */
433/* 417/*
434 * Free everything. That way malloc debugging can find leakage. 418 * Free everything. That way malloc debugging can find leakage.
435 */ 419 */
436void 420void
437rxvt_term::scr_release () 421rxvt_term::scr_release () NOTHROW
438{ 422{
439 uint16_t total_rows; 423 if (row_buf)
440 int i;
441
442 total_rows = TermWin.nrow + TermWin.saveLines;
443
444#ifdef DEBUG_STRICT
445 for (i = 0; i < total_rows; i++)
446 {
447 if (screen.text[i])
448 /* then so is screen.rend[i] */
449 assert (screen.rend[i]);
450 } 424 {
451#endif
452
453 delete talloc; talloc = 0; 425 delete talloc; talloc = 0;
454 delete ralloc; ralloc = 0; 426 delete ralloc; ralloc = 0;
455 427
456 free (screen.text); 428 free (row_buf);
457 free (screen.tlen); 429 free (swap_buf);
458 free (screen.rend); 430 free (drawn_buf);
459 free (drawn_text); 431 row_buf = 0; // signal that we freed all the arrays above
460 free (drawn_rend); 432
461 free (swap.text);
462 free (swap.tlen);
463 free (swap.rend);
464 free (buf_text);
465 free (buf_rend);
466 free (tabs); 433 free (tabs);
467 434 tabs = 0;
468 /* NULL these so if anything tries to use them, we'll know about it */ 435 }
469 screen.text = drawn_text = swap.text = NULL;
470 screen.rend = drawn_rend = swap.rend = NULL;
471 screen.tlen = swap.tlen = NULL;
472 buf_text = NULL;
473 buf_rend = NULL;
474 tabs = NULL;
475} 436}
476 437
477/* ------------------------------------------------------------------------- */ 438/* ------------------------------------------------------------------------- */
478/* 439/*
479 * Hard reset 440 * Hard/Soft reset
480 */ 441 */
481void 442void
482rxvt_term::scr_poweron () 443rxvt_term::scr_poweron ()
483{ 444{
484 D_SCREEN ((stderr, "rxvt_scr_poweron ()"));
485
486 scr_release (); 445 scr_release ();
487 prev_nrow = prev_ncol = 0; 446 prev_nrow = prev_ncol = 0;
447 rvideo_mode = false;
448 scr_soft_reset ();
488 scr_reset (); 449 scr_reset ();
489 450
490 scr_clear (); 451 scr_clear (true);
491 scr_refresh (SLOW_REFRESH); 452 scr_refresh ();
453}
454
455void
456rxvt_term::scr_soft_reset ()
457{
458 /* only affects modes, nothing drastic such as clearing the screen */
459#if ENABLE_OVERLAY
460 scr_overlay_off ();
461#endif
462
463 if (current_screen != PRIMARY)
464 scr_swap_screen ();
465
466 scr_scroll_region (0, MAX_ROWS - 1);
467 scr_rendition (0, ~RS_None);
468 scr_insert_mode (0);
492} 469}
493 470
494/* ------------------------------------------------------------------------- * 471/* ------------------------------------------------------------------------- *
495 * PROCESS SCREEN COMMANDS * 472 * PROCESS SCREEN COMMANDS *
496 * ------------------------------------------------------------------------- */ 473 * ------------------------------------------------------------------------- */
… …
498 * Save and Restore cursor 475 * Save and Restore cursor
499 * XTERM_SEQ: Save cursor : ESC 7 476 * XTERM_SEQ: Save cursor : ESC 7
500 * XTERM_SEQ: Restore cursor: ESC 8 477 * XTERM_SEQ: Restore cursor: ESC 8
501 */ 478 */
502void 479void
503rxvt_term::scr_cursor (int mode) 480rxvt_term::scr_cursor (cursor_mode mode) NOTHROW
504{ 481{
505 screen_t *s; 482 screen_t *s;
506
507 D_SCREEN ((stderr, "rxvt_scr_cursor (%c)", mode));
508 483
509#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) 484#if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR)
510 if (current_screen == SECONDARY) 485 if (current_screen == SECONDARY)
511 s = & (swap); 486 s = &swap;
512 else 487 else
513#endif 488#endif
514 s = & (screen); 489 s = &screen;
490
515 switch (mode) 491 switch (mode)
516 { 492 {
517 case SAVE: 493 case SAVE:
518 s->s_cur.row = s->cur.row; 494 s->s_cur.row = screen.cur.row;
519 s->s_cur.col = s->cur.col; 495 s->s_cur.col = screen.cur.col;
520 s->s_rstyle = rstyle; 496 s->s_rstyle = rstyle;
521 s->s_charset = s->charset; 497 s->s_charset = screen.charset;
522 s->s_charset_char = charsets[s->charset]; 498 s->s_charset_char = charsets[screen.charset];
523 break; 499 break;
500
524 case RESTORE: 501 case RESTORE:
525 want_refresh = 1; 502 want_refresh = 1;
526 s->cur.row = s->s_cur.row; 503 screen.cur.row = s->s_cur.row;
527 s->cur.col = s->s_cur.col; 504 screen.cur.col = s->s_cur.col;
528 s->flags &= ~Screen_WrapNext; 505 screen.flags &= ~Screen_WrapNext;
529 rstyle = s->s_rstyle; 506 rstyle = s->s_rstyle;
530 s->charset = s->s_charset; 507 screen.charset = s->s_charset;
531 charsets[s->charset] = s->s_charset_char; 508 charsets[screen.charset] = s->s_charset_char;
532 set_font_style (); 509 set_font_style ();
533 break; 510 break;
534 } 511 }
512
535 /* boundary check in case screen size changed between SAVE and RESTORE */ 513 /* boundary check in case screen size changed between SAVE and RESTORE */
536 MIN_IT (s->cur.row, TermWin.nrow - 1); 514 min_it (s->cur.row, nrow - 1);
537 MIN_IT (s->cur.col, TermWin.ncol - 1); 515 min_it (s->cur.col, ncol - 1);
538#ifdef DEBUG_STRICT
539 assert (s->cur.row >= 0); 516 assert (s->cur.row >= 0);
540 assert (s->cur.col >= 0); 517 assert (s->cur.col >= 0);
541#else /* drive with your eyes closed */ 518}
542 MAX_IT (s->cur.row, 0); 519
543 MAX_IT (s->cur.col, 0); 520void
544#endif 521rxvt_term::scr_swap_screen ()
522{
523 if (!option (Opt_secondaryScreen))
524 return;
525
526 for (int i = prev_nrow; i--; )
527 ::swap (ROW(i), swap_buf [i]);
528
529 ::swap (screen.cur, swap.cur);
530
531 screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1);
532 screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1);
545} 533}
546 534
547/* ------------------------------------------------------------------------- */ 535/* ------------------------------------------------------------------------- */
548/* 536/*
549 * Swap between primary and secondary screens 537 * Swap between primary and secondary screens
550 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h 538 * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h
551 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l 539 * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l
552 */ 540 */
553int 541void
554rxvt_term::scr_change_screen (int scrn) 542rxvt_term::scr_change_screen (int scrn)
555{ 543{
556 int i; 544 if (scrn == current_screen)
545 return;
546
547 want_refresh = 1;
548 view_start = 0;
549
550 selection_check (2); /* check for boundary cross */
551
552 current_screen = scrn;
553
557#if NSCREENS 554#if NSCREENS
558 int offset; 555 if (option (Opt_secondaryScreen))
559#endif 556 {
560
561 want_refresh = 1;
562
563 D_SCREEN ((stderr, "rxvt_scr_change_screen (%d)", scrn));
564
565 TermWin.view_start = 0;
566
567 if (current_screen == scrn)
568 return current_screen;
569
570 selection_check (2); /* check for boundary cross */
571
572 SWAP_IT (current_screen, scrn, int);
573#if NSCREENS
574 num_scr = 0; 557 num_scr = 0;
575 offset = TermWin.saveLines; 558
576 for (i = prev_nrow; i--;) 559 scr_swap_screen ();
577 { 560
578 SWAP_IT (screen.text[i + offset], swap.text[i], text_t *); 561 ::swap (screen.charset, swap.charset);
579 SWAP_IT (screen.tlen[i + offset], swap.tlen[i], int16_t); 562 ::swap (screen.flags, swap.flags);
580 SWAP_IT (screen.rend[i + offset], swap.rend[i], rend_t *);
581 }
582 SWAP_IT (screen.cur.row, swap.cur.row, int16_t);
583 SWAP_IT (screen.cur.col, swap.cur.col, int16_t);
584# ifdef DEBUG_STRICT
585 assert ((screen.cur.row >= 0) && (screen.cur.row < prev_nrow));
586 assert ((screen.cur.col >= 0) && (screen.cur.col < prev_ncol));
587# else /* drive with your eyes closed */
588 MAX_IT (screen.cur.row, 0);
589 MIN_IT (screen.cur.row, (int32_t)prev_nrow - 1);
590 MAX_IT (screen.cur.col, 0);
591 MIN_IT (screen.cur.col, (int32_t)prev_ncol - 1);
592# endif
593 SWAP_IT (screen.charset, swap.charset, int16_t);
594 SWAP_IT (screen.flags, swap.flags, int);
595 screen.flags |= Screen_VisibleCursor; 563 screen.flags |= Screen_VisibleCursor;
596 swap.flags |= Screen_VisibleCursor; 564 swap.flags |= Screen_VisibleCursor;
597#else 565 }
598# ifdef SCROLL_ON_NO_SECONDARY 566 else
599 if (current_screen == PRIMARY) 567#endif
568 if (option (Opt_secondaryScroll))
600 scr_scroll_text (0, (prev_nrow - 1), prev_nrow, 0); 569 scr_scroll_text (0, prev_nrow - 1, prev_nrow);
601# endif 570}
602#endif 571
603 return scrn; 572// clear WrapNext indicator, solidifying position on next line
573void
574rxvt_term::scr_do_wrap () NOTHROW
575{
576 if (!(screen.flags & Screen_WrapNext))
577 return;
578
579 screen.flags &= ~Screen_WrapNext;
580
581 screen.cur.col = 0;
582
583 if (screen.cur.row == screen.bscroll)
584 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
585 else if (screen.cur.row < nrow - 1)
586 screen.cur.row++;
604} 587}
605 588
606/* ------------------------------------------------------------------------- */ 589/* ------------------------------------------------------------------------- */
607/* 590/*
608 * Change the colour for following text 591 * Change the colour for following text
609 */ 592 */
610void 593void
611rxvt_term::scr_color (unsigned int color, int fgbg) 594rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW
612{ 595{
613 color &= RS_fgMask; 596 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
597 color = fgbg;
598
614 if (fgbg == Color_fg) 599 if (fgbg == Color_fg)
615 rstyle = SET_FGCOLOR (rstyle, color); 600 rstyle = SET_FGCOLOR (rstyle, color);
616 else 601 else
617 rstyle = SET_BGCOLOR (rstyle, color); 602 rstyle = SET_BGCOLOR (rstyle, color);
618} 603}
… …
620/* ------------------------------------------------------------------------- */ 605/* ------------------------------------------------------------------------- */
621/* 606/*
622 * Change the rendition style for following text 607 * Change the rendition style for following text
623 */ 608 */
624void 609void
625rxvt_term::scr_rendition (int set, int style) 610rxvt_term::scr_rendition (int set, int style) NOTHROW
626 { 611{
627 if (set) 612 if (set)
628 rstyle |= style; 613 rstyle |= style;
629 else if (style == ~RS_None) 614 else if (style == ~RS_None)
630 rstyle = DEFAULT_RSTYLE; 615 rstyle = DEFAULT_RSTYLE;
631 else 616 else
632 rstyle &= ~style; 617 rstyle &= ~style;
633 } 618}
634 619
635/* ------------------------------------------------------------------------- */ 620/* ------------------------------------------------------------------------- */
636/* 621/*
637 * Scroll text between <row1> and <row2> inclusive, by <count> lines 622 * Scroll text between <row1> and <row2> inclusive, by <count> lines
638 * count positive ==> scroll up 623 * count positive ==> scroll up
639 * count negative ==> scroll down 624 * count negative ==> scroll down
640 * spec == 0 for normal routines
641 */ 625 */
642int 626int
643rxvt_term::scr_scroll_text (int row1, int row2, int count, int spec) 627rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW
644{ 628{
645 int i, j;
646 long nscrolled;
647
648 if (count == 0 || (row1 > row2)) 629 if (count == 0 || (row1 > row2))
649 return 0; 630 return 0;
650 631
651 want_refresh = 1; 632 want_refresh = 1;
652 D_SCREEN ((stderr, "rxvt_scroll_text (%d,%d,%d,%d): %s", row1, row2, count, spec, (current_screen == PRIMARY) ? "Primary" : "Secondary")); 633 num_scr += count;
653 634
654 if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY)) 635 if (count > 0
636 && row1 == 0
637 && (current_screen == PRIMARY || option (Opt_secondaryScroll)))
638 {
639 top_row = max (top_row - count, -saveLines);
640
641 // scroll everything up 'count' lines
642 term_start = (term_start + count) % total_rows;
643
644 // sever bottommost line
655 { 645 {
656 nscrolled = (long)TermWin.nscrolled + (long)count; 646 line_t &l = ROW(row2 - count);
647 l.is_longer (0);
648 l.touch ();
649 }
657 650
658 if (nscrolled > (long)TermWin.saveLines) 651 // erase newly scrolled-in lines
659 TermWin.nscrolled = TermWin.saveLines; 652 for (int i = count; i--; )
653 {
654 line_t &l = ROW(nrow - 1 - i);
655
656 // optimize if already cleared, can be significant on slow machines
657 // could be rolled into scr_blank_screen_mem
658 if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask)))
659 {
660 scr_blank_line (l, 0, l.l, rstyle);
661 l.l = 0;
662 l.f = 0;
663 }
660 else 664 else
661 TermWin.nscrolled = (uint16_t)nscrolled; 665 scr_blank_screen_mem (l, rstyle);
666 }
662 667
668 // now copy lines below the scroll region bottom to the
669 // bottom of the screen again, so they look as if they
670 // hadn't moved.
671 for (int i = nrow; --i > row2; )
672 {
673 line_t &l1 = ROW(i - count);
674 line_t &l2 = ROW(i);
675
676 ::swap (l1, l2);
677 l2.touch ();
678 }
679
680 // move and/or clear selection, if any
681 if (selection.op && current_screen == selection.screen)
682 {
683 selection.beg.row -= count;
684 selection.end.row -= count;
685 selection.mark.row -= count;
686
687 if (selection.beg.row < top_row
688 || selection.end.row < top_row
689 || selection.mark.row < top_row)
690 {
691 CLEAR_ALL_SELECTION ();
692 selection.op = SELECTION_CLEAR;
693 }
694 }
695
696 // finally move the view window, if desired
663 if ((Options & Opt_scrollWithBuffer) 697 if (option (Opt_scrollWithBuffer)
664 && TermWin.view_start != 0 698 && view_start != 0
665 && TermWin.view_start != TermWin.saveLines) 699 && view_start != -saveLines)
666 scr_page (UP, count); 700 scr_page (UP, count);
701
702 if (SHOULD_INVOKE (HOOK_SCROLL_BACK))
703 HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END));
704 }
705 else
667 } 706 {
668 else if (!spec)
669 row1 += TermWin.saveLines;
670
671 row2 += TermWin.saveLines;
672
673 if (selection.op && current_screen == selection.screen) 707 if (selection.op && current_screen == selection.screen)
674 { 708 {
675 i = selection.beg.row + TermWin.saveLines; 709 if ((selection.beg.row < row1 && selection.end.row > row1)
676 j = selection.end.row + TermWin.saveLines; 710 || (selection.beg.row < row2 && selection.end.row > row2)
677 if ((i < row1 && j > row1) 711 || (selection.beg.row - count < row1 && selection.beg.row >= row1)
678 || (i < row2 && j > row2) 712 || (selection.beg.row - count > row2 && selection.beg.row <= row2)
679 || (i - count < row1 && i >= row1) 713 || (selection.end.row - count < row1 && selection.end.row >= row1)
680 || (i - count > row2 && i <= row2) 714 || (selection.end.row - count > row2 && selection.end.row <= row2))
681 || (j - count < row1 && j >= row1)
682 || (j - count > row2 && j <= row2))
683 { 715 {
684 CLEAR_ALL_SELECTION (); 716 CLEAR_ALL_SELECTION ();
685 selection.op = SELECTION_CLEAR; /* XXX: too aggressive? */ 717 selection.op = SELECTION_CLEAR;
686 } 718 }
687 else if (j >= row1 && j <= row2) 719 else if (selection.end.row >= row1 && selection.end.row <= row2)
688 { 720 {
689 /* move selected region too */ 721 /* move selected region too */
690 selection.beg.row -= count; 722 selection.beg.row -= count;
691 selection.end.row -= count; 723 selection.end.row -= count;
692 selection.mark.row -= count; 724 selection.mark.row -= count;
725
726 selection_check (0);
693 } 727 }
694 }
695
696 selection_check (0); /* _after_ TermWin.nscrolled update */
697
698 num_scr += count;
699 j = count;
700
701 if (count < 0)
702 count = -count;
703
704 i = row2 - row1 + 1;
705 MIN_IT (count, i);
706
707 if (j > 0)
708 {
709 /* A: scroll up */
710
711 /* A1: Copy lines that will get clobbered by the rotation */
712 for (i = 0, j = row1; i < count; i++, j++)
713 { 728 }
714 buf_text[i] = screen.text[j]; 729
715 buf_rend[i] = screen.rend[j]; 730 // use a simple and robust scrolling algorithm, this
731 // part of scr_scroll_text is not time-critical.
732
733 int rows = row2 - row1 + 1;
734
735 min_it (count, rows);
736
737 line_t *temp_buf = row_buf + total_rows;
738
739 for (int row = 0; row < rows; row++)
716 } 740 {
717 /* A2: Rotate lines */ 741 temp_buf [row] = ROW(row1 + (row + count + rows) % rows);
718 for (j = row1, i = j + count; i <= row2; i++, j++) 742
743 if (!IN_RANGE_EXC (row + count, 0, rows))
744 scr_blank_screen_mem (temp_buf [row], rstyle);
719 { 745 }
720 screen.tlen[j] = screen.tlen[i];
721 screen.text[j] = screen.text[i];
722 screen.rend[j] = screen.rend[i];
723 }
724 j = row2 - count + 1, i = count;
725 }
726 else /* if (j < 0) */
727 {
728 /* B: scroll down */
729 746
730 /* B1: Copy lines that will get clobbered by the rotation */ 747 for (int row = 0; row < rows; row++)
731 for (i = 0, j = row2; i < count; i++, j--) 748 ROW(row1 + row) = temp_buf [row];
732 {
733 buf_text[i] = screen.text[j];
734 buf_rend[i] = screen.rend[j];
735 }
736 /* B2: Rotate lines */
737 for (j = row2, i = j - count; i >= row1; i--, j--)
738 {
739 screen.tlen[j] = screen.tlen[i];
740 screen.text[j] = screen.text[i];
741 screen.rend[j] = screen.rend[i];
742 }
743 j = row1, i = count;
744 count = -count;
745 }
746
747 /* C: Resurrect lines */
748 for (; i--; j++)
749 {
750 screen.tlen[j] = 0;
751 screen.text[j] = buf_text[i];
752 screen.rend[j] = buf_rend[i];
753
754 if (!spec) /* line length may not equal TermWin.ncol */
755 scr_blank_screen_mem (screen.text, screen.rend,
756 (unsigned int)j, rstyle);
757 } 749 }
758 750
759 return count; 751 return count;
760} 752}
761 753
762/* ------------------------------------------------------------------------- */ 754/* ------------------------------------------------------------------------- */
763/* 755/*
764 * Add text given in <str> of length <len> to screen struct 756 * Add text given in <str> of length <len> to screen struct
765 */ 757 */
766void 758void
767rxvt_term::scr_add_lines (const uint32_t *str, int nlines, int len) 759rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW
768{ 760{
769 unsigned char checksel, clearsel;
770 uint32_t c;
771 int i, row, last_col;
772 text_t *stp;
773 rend_t *srp;
774
775 if (len <= 0) /* sanity */ 761 if (len <= 0) /* sanity */
776 return; 762 return;
777 763
764 unsigned char checksel;
765 unicode_t c;
766 int ncol = this->ncol;
767 const wchar_t *strend = str + len;
768
778 want_refresh = 1; 769 want_refresh = 1;
779 last_col = TermWin.ncol;
780
781 D_SCREEN ((stderr, "rxvt_scr_add_lines (%d,%d)", nlines, len));
782 ZERO_SCROLLBACK (); 770 ZERO_SCROLLBACK ();
771
783 if (nlines > 0) 772 if (minlines > 0)
784 { 773 {
785 nlines += (screen.cur.row - screen.bscroll); 774 minlines += screen.cur.row - screen.bscroll;
775 min_it (minlines, screen.cur.row - top_row);
776
786 if ((nlines > 0) 777 if (minlines > 0
787 && (screen.tscroll == 0) 778 && screen.tscroll == 0
788 && (screen.bscroll == (TermWin.nrow - 1))) 779 && screen.bscroll == nrow - 1)
789 { 780 {
790 /* _at least_ this many lines need to be scrolled */ 781 /* _at least_ this many lines need to be scrolled */
791 scr_scroll_text (screen.tscroll, screen.bscroll, nlines, 0); 782 scr_scroll_text (screen.tscroll, screen.bscroll, minlines);
792 screen.cur.row -= nlines; 783 screen.cur.row -= minlines;
793 } 784 }
794 } 785 }
795#ifdef DEBUG_STRICT 786
796 assert (screen.cur.col < last_col); 787 assert (screen.cur.col < ncol);
797 assert ((screen.cur.row < TermWin.nrow) 788 assert (screen.cur.row < nrow
798 && (screen.cur.row >= - (int32_t)TermWin.nscrolled)); 789 && screen.cur.row >= top_row);
799#else /* drive with your eyes closed */ 790 int row = screen.cur.row;
800 MIN_IT (screen.cur.col, last_col - 1);
801 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
802 MAX_IT (screen.cur.row, - (int32_t)TermWin.nscrolled);
803#endif
804 row = screen.cur.row + TermWin.saveLines;
805 791
806 checksel = (selection.op 792 checksel = selection.op && current_screen == selection.screen ? 1 : 0;
807 && current_screen == selection.screen) ? 1 : 0;
808 clearsel = 0;
809 793
810 stp = screen.text[row]; 794 line_t *line = &ROW(row);
811 srp = screen.rend[row];
812 795
813 for (i = 0; i < len;) 796 while (str < strend)
814 { 797 {
815 c = str[i++]; 798 c = (unicode_t)*str++; // convert to rxvt-unicodes representation
816 switch (c) 799
800 if (expect_false (c < 0x20))
801 if (c == C0_LF)
817 { 802 {
818 case '\t': 803 max_it (line->l, screen.cur.col);
819 scr_tab (1); 804
805 screen.flags &= ~Screen_WrapNext;
806
807 if (screen.cur.row == screen.bscroll)
808 scr_scroll_text (screen.tscroll, screen.bscroll, 1);
809 else if (screen.cur.row < (nrow - 1))
810 row = ++screen.cur.row;
811
812 line = &ROW(row); /* _must_ refresh */
820 continue; 813 continue;
821 case '\n': 814 }
822 if (screen.tlen[row] != -1) /* XXX: think about this */ 815 else if (c == C0_CR)
823 MAX_IT (screen.tlen[row], screen.cur.col); 816 {
824 screen.flags &= ~Screen_WrapNext; 817 max_it (line->l, screen.cur.col);
825 if (screen.cur.row == screen.bscroll) 818
826 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
827 else if (screen.cur.row < (TermWin.nrow - 1))
828 row = (++screen.cur.row) + TermWin.saveLines;
829 stp = screen.text[row]; /* _must_ refresh */
830 srp = screen.rend[row]; /* _must_ refresh */
831 continue;
832 case '\r':
833 if (screen.tlen[row] != -1) /* XXX: think about this */
834 MAX_IT (screen.tlen[row], screen.cur.col);
835 screen.flags &= ~Screen_WrapNext; 819 screen.flags &= ~Screen_WrapNext;
836 screen.cur.col = 0; 820 screen.cur.col = 0;
837 continue; 821 continue;
838 default:
839 if (c == 127)
840 continue; /* yummmm..... */
841 break;
842 } 822 }
823 else if (c == C0_HT)
824 {
825 scr_tab (1, true);
826 continue;
827 }
843 828
829 if (expect_false (
844 if (checksel /* see if we're writing within selection */ 830 checksel /* see if we're writing within selection */
845 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 831 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
846 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 832 && ROWCOL_IS_BEFORE (screen.cur, selection.end)
833 ))
847 { 834 {
848 checksel = 0; 835 checksel = 0;
849 clearsel = 1;
850 } 836 /*
851 837 * If we wrote anywhere in the selected area, kill the selection
852 if (screen.flags & Screen_WrapNext) 838 * XXX: should we kill the mark too? Possibly, but maybe that
839 * should be a similar check.
840 */
841 CLEAR_SELECTION ();
853 { 842 }
854 screen.tlen[row] = -1;
855 if (screen.cur.row == screen.bscroll)
856 scr_scroll_text (screen.tscroll, screen.bscroll, 1, 0);
857 else if (screen.cur.row < (TermWin.nrow - 1))
858 row = (++screen.cur.row) + TermWin.saveLines;
859 843
860 stp = screen.text[row]; /* _must_ refresh */ 844 if (expect_false (screen.flags & Screen_WrapNext))
861 srp = screen.rend[row]; /* _must_ refresh */
862 screen.cur.col = 0;
863 screen.flags &= ~Screen_WrapNext;
864 }
865
866 if (screen.flags & Screen_Insert)
867 scr_insdel_chars (1, INSERT);
868
869 if (IS_COMPOSE (c))
870 c = REPLACEMENT_CHAR;
871
872 // rely on wcwidth to tell us the character width, at least for non-latin1
873 // do wcwidth before further replacements, as wcwidth says that line-drawing
874 // characters have width -1 (DOH!) on gnu/linux sometimes.
875 int width = c < 256 ? 1 : wcwidth (c);
876
877 if (charsets[screen.charset] == '0') // DEC SPECIAL
878 switch (c)
879 { 845 {
846 scr_do_wrap ();
847
848 line->l = ncol;
849 line->is_longer (1);
850
851 row = screen.cur.row;
852 line = &ROW(row); /* _must_ refresh */
853 }
854
855 // some utf-8 decoders "decode" surrogate characters: let's fix this.
856 if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff)))
857 c = 0xfffd;
858
859 // rely on wcwidth to tell us the character width, do wcwidth before
860 // further replacements, as wcwidth might return -1 for the line
861 // drawing characters below as they might be invalid in the current
862 // locale.
863 int width = WCWIDTH (c);
864
865 if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL
866 {
880 // vt100 special graphics and line drawing 867 // vt100 special graphics and line drawing
881 case '`': c = 0x25c6; break; case '_': c = 0x0020; break; 868 // 5f-7e standard vt100
882 case 'a': c = 0x2592; break; case 'b': c = 0x2409; break; case 'c': c = 0x240c; break; 869 // 40-5e rxvt extension for extra curses acs chars
883 case 'd': c = 0x240d; break; case 'e': c = 0x240a; break; case 'f': c = 0x00b0; break; 870 static uint16_t vt100_0[62] = { // 41 .. 7e
884 case 'g': c = 0x00b1; break; case 'h': c = 0x2424; break; case 'i': c = 0x240b; break; 871 0x2191, 0x2193, 0x2192, 0x2190, 0x2588, 0x259a, 0x2603, // 41-47 hi mr. snowman!
885 case 'j': c = 0x2518; break; case 'k': c = 0x2510; break; case 'l': c = 0x250c; break; 872 0, 0, 0, 0, 0, 0, 0, 0, // 48-4f
886 case 'm': c = 0x2514; break; case 'n': c = 0x253c; break; case 'o': c = 0x23ba; break; 873 0, 0, 0, 0, 0, 0, 0, 0, // 50-57
887 case 'p': c = 0x23bb; break; case 'q': c = 0x2500; break; case 'r': c = 0x23bc; break; 874 0, 0, 0, 0, 0, 0, 0, 0x0020, // 58-5f
888 case 's': c = 0x23bd; break; case 't': c = 0x251c; break; case 'u': c = 0x2524; break; 875 0x25c6, 0x2592, 0x2409, 0x240c, 0x240d, 0x240a, 0x00b0, 0x00b1, // 60-67
889 case 'v': c = 0x2534; break; case 'w': c = 0x252c; break; case 'x': c = 0x2502; break; 876 0x2424, 0x240b, 0x2518, 0x2510, 0x250c, 0x2514, 0x253c, 0x23ba, // 68-6f
890 case 'y': c = 0x2264; break; case 'z': c = 0x2265; break; case '{': c = 0x03c0; break; 877 0x23bb, 0x2500, 0x23bc, 0x23bd, 0x251c, 0x2524, 0x2534, 0x252c, // 70-77
891 case '|': c = 0x2260; break; case '}': c = 0x00a3; break; case '~': c = 0x00b7; break; 878 0x2502, 0x2264, 0x2265, 0x03c0, 0x2260, 0x00a3, 0x00b7, // 78-7e
892 } 879 };
880
881 if (c >= 0x41 && c <= 0x7e && vt100_0[c - 0x41])
882 {
883 c = vt100_0[c - 0x41];
884 width = 1; // vt100 line drawing characters are always single-width
885 }
893 886 }
894 887
888 if (expect_false (screen.flags & Screen_Insert))
889 scr_insdel_chars (width, INSERT);
890
895 if (width > 0) 891 if (width != 0)
896 { 892 {
897#if !UNICODE_3 893#if !UNICODE_3
898 // trim characters we can't store directly :( 894 // trim characters we can't store directly :(
899 if (c >= 0x10000) 895 if (c >= 0x10000)
896# if ENABLE_COMBINING
900 c = rxvt_composite.compose (c); // map to lower 16 bits 897 c = rxvt_composite.compose (c); // map to lower 16 bits
898# else
899 c = 0xfffd;
901#endif 900# endif
901#endif
902
903 // nuke the character at this position, if required
904 if (expect_false (
905 line->t[screen.cur.col] == NOCHAR
906 || (screen.cur.col < ncol - 1
907 && line->t[screen.cur.col + 1] == NOCHAR)
908 ))
909 scr_kill_char (*line, screen.cur.col);
910
902 rend_t rend = SET_FONT (rstyle, TermWin.fontset->find_font (c)); 911 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
912
913 // if the character doesn't fit into the remaining columns...
914 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
915 {
916 // ... artificially enlargen the previous one
917 c = NOCHAR;
918 // and try the same character next loop iteration
919 --str;
920 }
921
922 line->touch ();
903 923
904 do 924 do
905 { 925 {
906 stp[screen.cur.col] = c; 926 line->t[screen.cur.col] = c;
907 srp[screen.cur.col] = rend; 927 line->r[screen.cur.col] = rend;
908 928
909 if (screen.cur.col < last_col - 1) 929 if (expect_true (screen.cur.col < ncol - 1))
910 screen.cur.col++; 930 screen.cur.col++;
911 else 931 else
912 { 932 {
913 screen.tlen[row] = last_col; 933 line->l = ncol;
914 if (screen.flags & Screen_Autowrap) 934 if (screen.flags & Screen_Autowrap)
915 screen.flags |= Screen_WrapNext; 935 screen.flags |= Screen_WrapNext;
916 break; 936 break;
917 } 937 }
918 938
919 c = NOCHAR; 939 c = NOCHAR;
920 } 940 }
921 while (--width > 0); 941 while (expect_false (--width > 0));
922 942
923 // pad with spaces when overwriting wide character with smaller one 943 // pad with spaces when overwriting wide character with smaller one
924 for (int c = screen.cur.col; c < last_col && stp[c] == NOCHAR; c++) 944 if (expect_false (!width))
925 { 945 {
946 line->touch ();
947
948 for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++)
949 {
926 stp[c] = ' '; 950 line->t[c] = ' ';
927 srp[c] = rend; 951 line->r[c] = rend;
952 }
928 } 953 }
929 } 954 }
955#if ENABLE_COMBINING
930 else if (width == 0) 956 else // width == 0
931 { 957 {
932#if ENCODING_COMPOSE 958 if (c != 0xfeff) // ignore BOM
933 // handle combining characters
934 // we just tag the accent on the previous on-screen character.
935 // this is arguably not correct, but also arguably not wrong.
936 // we don't handle double-width characters nicely yet.
937
938 text_t *tp;
939 rend_t *rp;
940
941 if (screen.cur.col > 0)
942 { 959 {
960 // handle combining characters
961 // we just tag the accent on the previous on-screen character.
962 // this is arguably not correct, but also arguably not wrong.
963 // we don't handle double-width characters nicely yet.
964 line_t *linep;
965 text_t *tp;
966 rend_t *rp;
967
968 if (screen.cur.col > 0)
969 {
970 linep = line;
943 tp = stp + screen.cur.col - 1; 971 tp = line->t + screen.cur.col - 1;
944 rp = srp + screen.cur.col - 1; 972 rp = line->r + screen.cur.col - 1;
973 }
974 else if (screen.cur.row > 0
975 && ROW(screen.cur.row - 1).is_longer ())
976 {
977 linep = &ROW(screen.cur.row - 1);
978 tp = line->t + ncol - 1;
979 rp = line->r + ncol - 1;
980 }
981 else
982 continue;
983
984 linep->touch ();
985
986 while (*tp == NOCHAR && tp > linep->t)
987 tp--, rp--;
988
989 // first try to find a precomposed character
990 unicode_t n = rxvt_compose (*tp, c);
991 if (n == NOCHAR)
992 n = rxvt_composite.compose (*tp, c);
993
994 *tp = n;
995 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
945 } 996 }
946 else if (screen.cur.row > 0
947 && screen.tlen [screen.cur.row - 1 + TermWin.saveLines] == -1)
948 {
949 tp = screen.text[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
950 rp = screen.rend[screen.cur.row - 1 + TermWin.saveLines] + last_col - 1;
951 } 997 }
952 else
953 continue;
954
955 // handle double-width-chars by making them look extremely ugly
956 if (*tp == NOCHAR)
957 *tp = ' '; // hack //D //TODO //--tp, --rp;
958
959 // first try to find a precomposed character
960 uint32_t n = rxvt_compose (*tp, c);
961 if (n == NOCHAR)
962 n = rxvt_composite.compose (*tp, c);
963
964 *tp = n;
965 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
966#endif 998#endif
967 }
968 } 999 }
969 1000
970 if (screen.tlen[row] != -1) /* XXX: think about this */ 1001 max_it (line->l, screen.cur.col);
971 MAX_IT (screen.tlen[row], screen.cur.col);
972 1002
973 /*
974 * If we wrote anywhere in the selected area, kill the selection
975 * XXX: should we kill the mark too? Possibly, but maybe that
976 * should be a similar check.
977 */
978 if (clearsel)
979 CLEAR_SELECTION ();
980
981#ifdef DEBUG_STRICT
982 assert (screen.cur.row >= 0); 1003 assert (screen.cur.row >= 0);
983#else /* drive with your eyes closed */
984 MAX_IT (screen.cur.row, 0);
985#endif
986} 1004}
987 1005
988/* ------------------------------------------------------------------------- */ 1006/* ------------------------------------------------------------------------- */
989/* 1007/*
990 * Process Backspace. Move back the cursor back a position, wrap if have to 1008 * Process Backspace. Move back the cursor back a position, wrap if have to
991 * XTERM_SEQ: CTRL-H 1009 * XTERM_SEQ: CTRL-H
992 */ 1010 */
993void 1011void
994rxvt_term::scr_backspace () 1012rxvt_term::scr_backspace () NOTHROW
995{ 1013{
996 want_refresh = 1;
997 if (screen.cur.col == 0) 1014 if (screen.cur.col == 0)
998 { 1015 {
999 if (screen.cur.row > 0) 1016 if (screen.cur.row > 0)
1000 { 1017 {
1001#ifdef TERMCAP_HAS_BW 1018#ifdef TERMCAP_HAS_BW
1002 screen.cur.col = TermWin.ncol - 1; 1019 screen.cur.col = ncol - 1;
1003 screen.cur.row--; 1020 --screen.cur.row;
1004 return;
1005#endif
1006 1021
1022 want_refresh = 1;
1023#endif
1007 } 1024 }
1008 } 1025 }
1009 else if ((screen.flags & Screen_WrapNext) == 0) 1026 else
1010 scr_gotorc (0, -1, RELATIVE); 1027 scr_gotorc (0, -1, RELATIVE);
1011 screen.flags &= ~Screen_WrapNext;
1012} 1028}
1013 1029
1014/* ------------------------------------------------------------------------- */ 1030/* ------------------------------------------------------------------------- */
1015/* 1031/*
1016 * Process Horizontal Tab 1032 * Process Horizontal Tab
1017 * count: +ve = forward; -ve = backwards 1033 * count: +ve = forward; -ve = backwards
1018 * XTERM_SEQ: CTRL-I 1034 * XTERM_SEQ: CTRL-I
1019 */ 1035 */
1020void 1036void
1021rxvt_term::scr_tab (int count) 1037rxvt_term::scr_tab (int count, bool ht) NOTHROW
1022{ 1038{
1023 int i, x; 1039 int i, x;
1024 1040
1025 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
1026 want_refresh = 1; 1041 want_refresh = 1;
1027 i = x = screen.cur.col; 1042 i = x = screen.cur.col;
1043
1028 if (count == 0) 1044 if (count == 0)
1029 return; 1045 return;
1030 else if (count > 0) 1046 else if (count > 0)
1031 { 1047 {
1048 line_t &l = ROW(screen.cur.row);
1049 rend_t base_rend = l.r[i];
1050 ht &= l.t[i] == ' ';
1051
1032 for (; ++i < TermWin.ncol; ) 1052 for (; ++i < ncol; )
1033 if (tabs[i]) 1053 if (tabs[i])
1034 { 1054 {
1035 x = i; 1055 x = i;
1056
1036 if (!--count) 1057 if (!--count)
1037 break; 1058 break;
1038 } 1059 }
1060 else
1061 ht &= l.t[i] == ' '
1062 && RS_SAME (l.r[i], base_rend);
1063
1039 if (count) 1064 if (count)
1040 x = TermWin.ncol - 1; 1065 x = ncol - 1;
1066
1067 // store horizontal tab commands as characters inside the text
1068 // buffer so they can be selected and pasted.
1069 if (ht && option (Opt_pastableTabs))
1070 {
1071 base_rend = SET_FONT (base_rend, 0);
1072
1073 l.touch (x);
1074
1075 i = screen.cur.col;
1076
1077 l.t[i] = '\t';
1078 l.r[i] = base_rend;
1079
1080 while (++i < x)
1081 {
1082 l.t[i] = NOCHAR;
1083 l.r[i] = base_rend;
1084 }
1085 }
1041 } 1086 }
1042 else /* if (count < 0) */ 1087 else /* if (count < 0) */
1043 { 1088 {
1044 for (; --i >= 0; ) 1089 for (; --i >= 0; )
1045 if (tabs[i]) 1090 if (tabs[i])
1046 { 1091 {
1047 x = i; 1092 x = i;
1048 if (!++count) 1093 if (!++count)
1049 break; 1094 break;
1050 } 1095 }
1096
1051 if (count) 1097 if (count)
1052 x = 0; 1098 x = 0;
1053 } 1099 }
1100
1054 if (x != screen.cur.col) 1101 if (x != screen.cur.col)
1055 scr_gotorc (0, x, R_RELATIVE); 1102 scr_gotorc (0, x, R_RELATIVE);
1056} 1103}
1057 1104
1058/* ------------------------------------------------------------------------- */ 1105/* ------------------------------------------------------------------------- */
… …
1060 * Process DEC Back Index 1107 * Process DEC Back Index
1061 * XTERM_SEQ: ESC 6 1108 * XTERM_SEQ: ESC 6
1062 * Move cursor left in row. If we're at the left boundary, shift everything 1109 * Move cursor left in row. If we're at the left boundary, shift everything
1063 * in that row right. Clear left column. 1110 * in that row right. Clear left column.
1064 */ 1111 */
1065#ifndef NO_FRILLS 1112#if !ENABLE_MINIMAL
1066void 1113void
1067rxvt_term::scr_backindex () 1114rxvt_term::scr_backindex () NOTHROW
1068{ 1115{
1069 if (screen.cur.col > 0) 1116 if (screen.cur.col > 0)
1070 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1117 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1071 else 1118 else
1072 {
1073 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1074 return; /* um, yeah? */
1075 scr_insdel_chars (1, INSERT); 1119 scr_insdel_chars (1, INSERT);
1076 }
1077} 1120}
1078#endif 1121#endif
1079/* ------------------------------------------------------------------------- */ 1122/* ------------------------------------------------------------------------- */
1080/* 1123/*
1081 * Process DEC Forward Index 1124 * Process DEC Forward Index
1082 * XTERM_SEQ: ESC 9 1125 * XTERM_SEQ: ESC 9
1083 * Move cursor right in row. If we're at the right boundary, shift everything 1126 * Move cursor right in row. If we're at the right boundary, shift everything
1084 * in that row left. Clear right column. 1127 * in that row left. Clear right column.
1085 */ 1128 */
1086#ifndef NO_FRILLS 1129#if !ENABLE_MINIMAL
1087void 1130void
1088rxvt_term::scr_forwardindex () 1131rxvt_term::scr_forwardindex () NOTHROW
1089{ 1132{
1090 int row;
1091
1092 if (screen.cur.col < TermWin.ncol - 1) 1133 if (screen.cur.col < ncol - 1)
1093 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1134 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1094 else 1135 else
1095 { 1136 {
1096 row = screen.cur.row + TermWin.saveLines; 1137 line_t &l = ROW(screen.cur.row);
1097 if (screen.tlen[row] == 0) 1138
1098 return; /* um, yeah? */ 1139 l.touch ();
1099 else if (screen.tlen[row] == -1) 1140 l.is_longer (0);
1100 screen.tlen[row] = TermWin.ncol; 1141
1101 scr_gotorc (0, 0, R_RELATIVE); 1142 scr_gotorc (0, 0, R_RELATIVE);
1102 scr_insdel_chars (1, DELETE); 1143 scr_insdel_chars (1, DELETE);
1103 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1144 scr_gotorc (0, ncol - 1, R_RELATIVE);
1104 } 1145 }
1105} 1146}
1106#endif 1147#endif
1107 1148
1108/* ------------------------------------------------------------------------- */ 1149/* ------------------------------------------------------------------------- */
1109/* 1150/*
1110 * Goto Row/Column 1151 * Goto Row/Column
1111 */ 1152 */
1112void 1153void
1113rxvt_term::scr_gotorc (int row, int col, int relative) 1154rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1114{ 1155{
1115 want_refresh = 1; 1156 want_refresh = 1;
1116 ZERO_SCROLLBACK (); 1157 ZERO_SCROLLBACK ();
1117 1158
1118 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));
1119
1120 screen.cur.col = ((relative & C_RELATIVE) ? (screen.cur.col + col) 1159 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1121 : col); 1160 clamp_it (screen.cur.col, 0, ncol - 1);
1122 MAX_IT (screen.cur.col, 0);
1123 MIN_IT (screen.cur.col, (int32_t)TermWin.ncol - 1);
1124 1161
1125 screen.flags &= ~Screen_WrapNext; 1162 screen.flags &= ~Screen_WrapNext;
1163
1126 if (relative & R_RELATIVE) 1164 if (relative & R_RELATIVE)
1127 { 1165 {
1128 if (row > 0) 1166 if (row > 0)
1129 { 1167 {
1130 if (screen.cur.row <= screen.bscroll 1168 if (screen.cur.row <= screen.bscroll
… …
1143 } 1181 }
1144 } 1182 }
1145 else 1183 else
1146 { 1184 {
1147 if (screen.flags & Screen_Relative) 1185 if (screen.flags & Screen_Relative)
1186 {
1148 { /* relative origin mode */ 1187 /* relative origin mode */
1149 screen.cur.row = row + screen.tscroll; 1188 screen.cur.row = row + screen.tscroll;
1150 MIN_IT (screen.cur.row, screen.bscroll); 1189 min_it (screen.cur.row, screen.bscroll);
1151 } 1190 }
1152 else 1191 else
1153 screen.cur.row = row; 1192 screen.cur.row = row;
1154 } 1193 }
1155 MAX_IT (screen.cur.row, 0);
1156 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1157 1194
1158 while (screen.cur.col > 0 1195 clamp_it (screen.cur.row, 0, nrow - 1);
1159 && screen.text[screen.cur.row + TermWin.saveLines][screen.cur.col] == NOCHAR)
1160 screen.cur.col--;
1161} 1196}
1162 1197
1163/* ------------------------------------------------------------------------- */ 1198/* ------------------------------------------------------------------------- */
1164/* 1199/*
1165 * direction should be UP or DN 1200 * direction should be UP or DN
1166 */ 1201 */
1167void 1202void
1168rxvt_term::scr_index (enum page_dirn direction) 1203rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1169{ 1204{
1170 int dirn; 1205 int dirn;
1171 1206
1172 want_refresh = 1; 1207 want_refresh = 1;
1208 ZERO_SCROLLBACK ();
1209
1173 dirn = ((direction == UP) ? 1 : -1); 1210 dirn = ((direction == UP) ? 1 : -1);
1174 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1175
1176 ZERO_SCROLLBACK ();
1177 1211
1178 screen.flags &= ~Screen_WrapNext; 1212 screen.flags &= ~Screen_WrapNext;
1213
1179 if ((screen.cur.row == screen.bscroll && direction == UP) 1214 if ((screen.cur.row == screen.bscroll && direction == UP)
1180 || (screen.cur.row == screen.tscroll && direction == DN)) 1215 || (screen.cur.row == screen.tscroll && direction == DN))
1181 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1216 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1182 else 1217 else
1183 screen.cur.row += dirn; 1218 screen.cur.row += dirn;
1184 MAX_IT (screen.cur.row, 0); 1219
1185 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1220 clamp_it (screen.cur.row, 0, nrow - 1);
1186 selection_check (0); 1221 selection_check (0);
1187} 1222}
1188 1223
1189/* ------------------------------------------------------------------------- */ 1224/* ------------------------------------------------------------------------- */
1190/* 1225/*
1191 * Erase part or whole of a line 1226 * Erase part or whole of a line
1192 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1227 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1193 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1228 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1194 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1229 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1230 * extension: clear to right unless wrapped: ESC [ 3 K
1195 */ 1231 */
1196void 1232void
1197rxvt_term::scr_erase_line (int mode) 1233rxvt_term::scr_erase_line (int mode) NOTHROW
1198{ 1234{
1199 unsigned int row, col, num; 1235 unsigned int col, num;
1200 1236
1201 want_refresh = 1; 1237 want_refresh = 1;
1202 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1203 ZERO_SCROLLBACK (); 1238 ZERO_SCROLLBACK ();
1204 1239
1205 selection_check (1); 1240 selection_check (1);
1206 1241
1207 screen.flags &= ~Screen_WrapNext; 1242 line_t &line = ROW(screen.cur.row);
1208 1243
1209 row = TermWin.saveLines + screen.cur.row; 1244 line.touch ();
1245 line.is_longer (0);
1246
1210 switch (mode) 1247 switch (mode)
1211 { 1248 {
1249 case 3:
1250 if (screen.flags & Screen_WrapNext)
1251 return;
1252
1253 /* fall through */
1254
1212 case 0: /* erase to end of line */ 1255 case 0: /* erase to end of line */
1213 col = screen.cur.col; 1256 col = screen.cur.col;
1214 num = TermWin.ncol - col; 1257 num = ncol - col;
1215 MIN_IT (screen.tlen[row], (int16_t)col); 1258 min_it (line.l, col);
1259
1216 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1260 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1217 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1261 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1218 CLEAR_SELECTION (); 1262 CLEAR_SELECTION ();
1219 break; 1263 break;
1264
1220 case 1: /* erase to beginning of line */ 1265 case 1: /* erase to beginning of line */
1221 col = 0; 1266 col = 0;
1222 num = screen.cur.col + 1; 1267 num = screen.cur.col + 1;
1268
1223 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1269 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1224 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1270 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1225 CLEAR_SELECTION (); 1271 CLEAR_SELECTION ();
1226 break; 1272 break;
1273
1227 case 2: /* erase whole line */ 1274 case 2: /* erase whole line */
1228 col = 0; 1275 col = 0;
1229 num = TermWin.ncol; 1276 num = ncol;
1230 screen.tlen[row] = 0; 1277 line.l = 0;
1231 if (selection.beg.row <= screen.cur.row 1278 if (selection.beg.row <= screen.cur.row
1232 && selection.end.row >= screen.cur.row) 1279 && selection.end.row >= screen.cur.row)
1233 CLEAR_SELECTION (); 1280 CLEAR_SELECTION ();
1234 break; 1281 break;
1235 default: 1282 default:
1236 return; 1283 return;
1237 } 1284 }
1238 1285
1239 if (screen.text[row]) 1286 scr_blank_line (line, col, num, rstyle);
1240 scr_blank_line (& (screen.text[row][col]),
1241 & (screen.rend[row][col]), num, rstyle);
1242 else
1243 scr_blank_screen_mem (screen.text, screen.rend, row, rstyle);
1244} 1287}
1245 1288
1246/* ------------------------------------------------------------------------- */ 1289/* ------------------------------------------------------------------------- */
1247/* 1290/*
1248 * Erase part of whole of the screen 1291 * Erase part of whole of the screen
1249 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1292 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1250 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1293 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1251 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1294 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1252 */ 1295 */
1253void 1296void
1254rxvt_term::scr_erase_screen (int mode) 1297rxvt_term::scr_erase_screen (int mode) NOTHROW
1255{ 1298{
1256 int num; 1299 int num;
1257 int32_t row, row_offset; 1300 int32_t row;
1258 rend_t ren; 1301 rend_t ren;
1259 XGCValues gcvalue; 1302 XGCValues gcvalue;
1260 1303
1261 want_refresh = 1; 1304 want_refresh = 1;
1262 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1263 ZERO_SCROLLBACK (); 1305 ZERO_SCROLLBACK ();
1264 row_offset = (int32_t)TermWin.saveLines;
1265 1306
1266 switch (mode) 1307 switch (mode)
1267 { 1308 {
1268 case 0: /* erase to end of screen */ 1309 case 0: /* erase to end of screen */
1269 selection_check (1); 1310 selection_check (1);
1270 scr_erase_line (0); 1311 scr_erase_line (0);
1271 row = screen.cur.row + 1; /* possible OOB */ 1312 row = screen.cur.row + 1; /* possible OOB */
1272 num = TermWin.nrow - row; 1313 num = nrow - row;
1273 break; 1314 break;
1274 case 1: /* erase to beginning of screen */ 1315 case 1: /* erase to beginning of screen */
1275 selection_check (3); 1316 selection_check (3);
1276 scr_erase_line (1); 1317 scr_erase_line (1);
1277 row = 0; 1318 row = 0;
1278 num = screen.cur.row; 1319 num = screen.cur.row;
1279 break; 1320 break;
1280 case 2: /* erase whole screen */ 1321 case 2: /* erase whole screen */
1281 selection_check (3); 1322 selection_check (3);
1282 row = 0; 1323 row = 0;
1283 num = TermWin.nrow; 1324 num = nrow;
1284 break; 1325 break;
1285 default: 1326 default:
1286 return; 1327 return;
1287 } 1328 }
1288 refresh_type |= REFRESH_BOUNDS; 1329
1289 if (selection.op && current_screen == selection.screen 1330 if (selection.op && current_screen == selection.screen
1290 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1331 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1291 || (selection.end.row >= row 1332 || (selection.end.row >= row
1292 && selection.end.row <= row + num))) 1333 && selection.end.row <= row + num)))
1293 CLEAR_SELECTION (); 1334 CLEAR_SELECTION ();
1335
1294 if (row >= TermWin.nrow) /* Out Of Bounds */ 1336 if (row >= nrow) /* Out Of Bounds */
1295 return; 1337 return;
1296 MIN_IT (num, (TermWin.nrow - row)); 1338
1339 min_it (num, nrow - row);
1340
1341 // TODO: the code below does not work when view_start != 0
1342 // the workaround is to disable the clear and use a normal refresh
1343 // when view_start != 0. mysterious.
1297 if (rstyle & (RS_RVid | RS_Uline)) 1344 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1298 ren = (rend_t) ~RS_None; 1345 ren = (rend_t) ~RS_None;
1299 else if (GET_BASEBG (rstyle) == Color_bg) 1346 else if (GET_BASEBG (rstyle) == Color_bg)
1300 { 1347 {
1301 ren = DEFAULT_RSTYLE; 1348 ren = DEFAULT_RSTYLE;
1302 CLEAR_ROWS (row, num); 1349
1350 if (mapped && !view_start)
1351 XClearArea (dpy, vt, 0,
1352 Row2Pixel (row - view_start), (unsigned int)width,
1353 (unsigned int)Height2Pixel (num), False);
1303 } 1354 }
1304 else 1355 else
1305 { 1356 {
1306 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1357 ren = rstyle & (RS_fgMask | RS_bgMask);
1358
1359 if (mapped && !view_start)
1360 {
1307 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; 1361 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1308 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1362 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1309 ERASE_ROWS (row, num); 1363 XFillRectangle (dpy, vt, gc,
1364 0, Row2Pixel (row - view_start),
1365 (unsigned int)width,
1366 (unsigned int)Height2Pixel (num));
1310 gcvalue.foreground = PixColors[Color_fg]; 1367 gcvalue.foreground = pix_colors[Color_fg];
1311 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1368 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1369 }
1312 } 1370 }
1371
1313 for (; num--; row++) 1372 for (; num--; row++)
1314 { 1373 {
1315 scr_blank_screen_mem (screen.text, screen.rend, 1374 scr_blank_screen_mem (ROW(row), rstyle);
1316 (unsigned int) (row + row_offset), rstyle); 1375
1317 screen.tlen[row + row_offset] = 0; 1376 if (!view_start)
1318 scr_blank_line (drawn_text[row], drawn_rend[row], 1377 scr_blank_line (drawn_buf [row], 0, ncol, ren);
1319 (unsigned int)TermWin.ncol, ren);
1320 } 1378 }
1321} 1379}
1380
1381#if !ENABLE_MINIMAL
1382void
1383rxvt_term::scr_erase_savelines () NOTHROW
1384{
1385 want_refresh = 1;
1386 ZERO_SCROLLBACK ();
1387
1388 top_row = 0;
1389}
1390#endif
1322 1391
1323/* ------------------------------------------------------------------------- */ 1392/* ------------------------------------------------------------------------- */
1324/* 1393/*
1325 * Fill the screen with `E's 1394 * Fill the screen with `E's
1326 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1395 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1327 */ 1396 */
1328void 1397void
1329rxvt_term::scr_E () 1398rxvt_term::scr_E () NOTHROW
1330{ 1399{
1331 int i, j, k; 1400 rend_t fs;
1332 rend_t *r1, fs;
1333 1401
1334 want_refresh = 1; 1402 want_refresh = 1;
1403 ZERO_SCROLLBACK ();
1404
1335 num_scr_allow = 0; 1405 num_scr_allow = 0;
1336 ZERO_SCROLLBACK ();
1337 selection_check (3); 1406 selection_check (3);
1338 1407
1339 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1408 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1340 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1409 for (int row = nrow; row--; )
1341 { 1410 {
1342 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1411 line_t &line = ROW(row);
1412
1343 fill_text (screen.text[k], 'E', TermWin.ncol); 1413 fill_text (line.t, 'E', ncol);
1344 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1414 rend_t *r1 = line.r;
1415
1416 for (int j = ncol; j--; )
1345 *r1++ = fs; 1417 *r1++ = fs;
1418
1419 line.is_longer (0);
1420 line.touch (ncol);
1346 } 1421 }
1347} 1422}
1348 1423
1349/* ------------------------------------------------------------------------- */ 1424/* ------------------------------------------------------------------------- */
1350/* 1425/*
1351 * Insert/Delete <count> lines 1426 * Insert/Delete <count> lines
1352 */ 1427 */
1353void 1428void
1354rxvt_term::scr_insdel_lines (int count, int insdel) 1429rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1355{ 1430{
1356 int end; 1431 int end;
1357 1432
1358 ZERO_SCROLLBACK (); 1433 ZERO_SCROLLBACK ();
1359 1434
1360 selection_check (1); 1435 selection_check (1);
1361 1436
… …
1368 if (insdel == DELETE) 1443 if (insdel == DELETE)
1369 return; 1444 return;
1370 else if (insdel == INSERT) 1445 else if (insdel == INSERT)
1371 count = end; 1446 count = end;
1372 } 1447 }
1373 screen.flags &= ~Screen_WrapNext;
1374 1448
1449 scr_do_wrap ();
1450
1375 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1451 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1376} 1452}
1377 1453
1378/* ------------------------------------------------------------------------- */ 1454/* ------------------------------------------------------------------------- */
1379/* 1455/*
1380 * Insert/Delete <count> characters from the current position 1456 * Insert/Delete <count> characters from the current position
1381 */ 1457 */
1382void 1458void
1383rxvt_term::scr_insdel_chars (int count, int insdel) 1459rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1384{ 1460{
1385 int col, row;
1386 rend_t tr;
1387 text_t *stp;
1388 rend_t *srp;
1389 int16_t *slp;
1390
1391 want_refresh = 1; 1461 want_refresh = 1;
1392 ZERO_SCROLLBACK (); 1462 ZERO_SCROLLBACK ();
1393 1463
1394 if (count <= 0) 1464 if (count <= 0)
1395 return; 1465 return;
1396 1466
1467 scr_do_wrap ();
1468
1397 selection_check (1); 1469 selection_check (1);
1398 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1470 min_it (count, ncol - screen.cur.col);
1399 1471
1400 row = screen.cur.row + TermWin.saveLines; 1472 int row = screen.cur.row;
1401 screen.flags &= ~Screen_WrapNext;
1402 1473
1403 stp = screen.text[row]; 1474 line_t *line = &ROW(row);
1404 srp = screen.rend[row]; 1475
1405 slp = & (screen.tlen[row]); 1476 line->touch ();
1477 line->is_longer (0);
1478
1479 // nuke wide spanning the start
1480 if (line->t[screen.cur.col] == NOCHAR)
1481 scr_kill_char (*line, screen.cur.col);
1482
1406 switch (insdel) 1483 switch (insdel)
1407 { 1484 {
1408 case INSERT: 1485 case INSERT:
1409 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1486 line->l = min (line->l + count, ncol);
1410 col--) 1487
1488 if (line->t[screen.cur.col] == NOCHAR)
1489 scr_kill_char (*line, screen.cur.col);
1490
1491 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1411 { 1492 {
1412 stp[col] = stp[col - count]; 1493 line->t[col] = line->t[col - count];
1413 srp[col] = srp[col - count]; 1494 line->r[col] = line->r[col - count];
1414 } 1495 }
1415 if (*slp != -1) 1496
1416 {
1417 *slp += count;
1418 MIN_IT (*slp, TermWin.ncol);
1419 }
1420 if (selection.op && current_screen == selection.screen 1497 if (selection.op && current_screen == selection.screen
1421 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1498 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1422 { 1499 {
1423 if (selection.end.row != screen.cur.row 1500 if (selection.end.row != screen.cur.row
1424 || (selection.end.col + count >= TermWin.ncol)) 1501 || (selection.end.col + count >= ncol))
1425 CLEAR_SELECTION (); 1502 CLEAR_SELECTION ();
1426 else 1503 else
1504 {
1427 { /* shift selection */ 1505 /* shift selection */
1428 selection.beg.col += count; 1506 selection.beg.col += count;
1429 selection.mark.col += count; /* XXX: yes? */ 1507 selection.mark.col += count; /* XXX: yes? */
1430 selection.end.col += count; 1508 selection.end.col += count;
1431 } 1509 }
1432 } 1510 }
1433 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1511
1434 (unsigned int)count, rstyle); 1512 scr_blank_line (*line, screen.cur.col, count, rstyle);
1435 break; 1513 break;
1514
1436 case ERASE: 1515 case ERASE:
1437 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1516 screen.cur.col += count; /* don't worry if > ncol */
1438 selection_check (1); 1517 selection_check (1);
1439 screen.cur.col -= count; 1518 screen.cur.col -= count;
1440 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1519
1441 (unsigned int)count, rstyle); 1520 // nuke wide char after the end
1521 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1522 scr_kill_char (*line, screen.cur.col + count);
1523
1524 scr_blank_line (*line, screen.cur.col, count, rstyle);
1442 break; 1525 break;
1526
1443 case DELETE: 1527 case DELETE:
1444 tr = srp[TermWin.ncol - 1] 1528 line->l = max (line->l - count, 0);
1445 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1529
1530 // nuke wide char spanning the end
1531 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1532 scr_kill_char (*line, screen.cur.col + count);
1533
1446 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1534 for (int col = screen.cur.col; (col + count) < ncol; col++)
1447 { 1535 {
1448 stp[col] = stp[col + count]; 1536 line->t[col] = line->t[col + count];
1449 srp[col] = srp[col + count]; 1537 line->r[col] = line->r[col + count];
1450 } 1538 }
1451 scr_blank_line (& (stp[TermWin.ncol - count]), 1539
1452 & (srp[TermWin.ncol - count]), 1540 scr_blank_line (*line, ncol - count, count, rstyle);
1453 (unsigned int)count, tr); 1541
1454 if (*slp == -1) /* break line continuation */
1455 *slp = TermWin.ncol;
1456 *slp -= count;
1457 MAX_IT (*slp, 0);
1458 if (selection.op && current_screen == selection.screen 1542 if (selection.op && current_screen == selection.screen
1459 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1543 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1460 { 1544 {
1461 if (selection.end.row != screen.cur.row 1545 if (selection.end.row != screen.cur.row
1462 || (screen.cur.col >= selection.beg.col - count) 1546 || (screen.cur.col >= selection.beg.col - count)
1463 || selection.end.col >= TermWin.ncol) 1547 || selection.end.col >= ncol)
1464 CLEAR_SELECTION (); 1548 CLEAR_SELECTION ();
1465 else 1549 else
1466 { 1550 {
1467 /* shift selection */ 1551 /* shift selection */
1468 selection.beg.col -= count; 1552 selection.beg.col -= count;
1469 selection.mark.col -= count; /* XXX: yes? */ 1553 selection.mark.col -= count; /* XXX: yes? */
1470 selection.end.col -= count; 1554 selection.end.col -= count;
1471 } 1555 }
1472 } 1556 }
1557
1473 break; 1558 break;
1474 } 1559 }
1475} 1560}
1476 1561
1477/* ------------------------------------------------------------------------- */ 1562/* ------------------------------------------------------------------------- */
1478/* 1563/*
1479 * Set the scrolling region 1564 * Set the scrolling region
1480 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1565 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1481 */ 1566 */
1482void 1567void
1483rxvt_term::scr_scroll_region (int top, int bot) 1568rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1484{ 1569{
1485 MAX_IT (top, 0); 1570 max_it (top, 0);
1486 MIN_IT (bot, (int)TermWin.nrow - 1); 1571 min_it (bot, nrow - 1);
1572
1487 if (top > bot) 1573 if (top > bot)
1488 return; 1574 return;
1575
1489 screen.tscroll = top; 1576 screen.tscroll = top;
1490 screen.bscroll = bot; 1577 screen.bscroll = bot;
1491 scr_gotorc (0, 0, 0); 1578 scr_gotorc (0, 0, 0);
1492} 1579}
1493 1580
… …
1496 * Make the cursor visible/invisible 1583 * Make the cursor visible/invisible
1497 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1584 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1498 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1585 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1499 */ 1586 */
1500void 1587void
1501rxvt_term::scr_cursor_visible (int mode) 1588rxvt_term::scr_cursor_visible (int mode) NOTHROW
1502{ 1589{
1503 want_refresh = 1; 1590 want_refresh = 1;
1591
1504 if (mode) 1592 if (mode)
1505 screen.flags |= Screen_VisibleCursor; 1593 screen.flags |= Screen_VisibleCursor;
1506 else 1594 else
1507 screen.flags &= ~Screen_VisibleCursor; 1595 screen.flags &= ~Screen_VisibleCursor;
1508} 1596}
… …
1512 * Set/unset automatic wrapping 1600 * Set/unset automatic wrapping
1513 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1601 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1514 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1602 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1515 */ 1603 */
1516void 1604void
1517rxvt_term::scr_autowrap (int mode) 1605rxvt_term::scr_autowrap (int mode) NOTHROW
1518{ 1606{
1519 if (mode) 1607 if (mode)
1520 screen.flags |= Screen_Autowrap; 1608 screen.flags |= Screen_Autowrap;
1521 else 1609 else
1522 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); 1610 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1523} 1611}
1524 1612
1525/* ------------------------------------------------------------------------- */ 1613/* ------------------------------------------------------------------------- */
1526/* 1614/*
1527 * Set/unset margin origin mode 1615 * Set/unset margin origin mode
… …
1531 * and the cursor cannot be moved outside. 1619 * and the cursor cannot be moved outside.
1532 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1620 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1533 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1621 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1534 */ 1622 */
1535void 1623void
1536rxvt_term::scr_relative_origin (int mode) 1624rxvt_term::scr_relative_origin (int mode) NOTHROW
1537{ 1625{
1538 if (mode) 1626 if (mode)
1539 screen.flags |= Screen_Relative; 1627 screen.flags |= Screen_Relative;
1540 else 1628 else
1541 screen.flags &= ~Screen_Relative; 1629 screen.flags &= ~Screen_Relative;
1630
1542 scr_gotorc (0, 0, 0); 1631 scr_gotorc (0, 0, 0);
1543} 1632}
1544 1633
1545/* ------------------------------------------------------------------------- */ 1634/* ------------------------------------------------------------------------- */
1546/* 1635/*
1547 * Set insert/replace mode 1636 * Set insert/replace mode
1548 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1637 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1549 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1638 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1550 */ 1639 */
1551void 1640void
1552rxvt_term::scr_insert_mode (int mode) 1641rxvt_term::scr_insert_mode (int mode) NOTHROW
1553{ 1642{
1554 if (mode) 1643 if (mode)
1555 screen.flags |= Screen_Insert; 1644 screen.flags |= Screen_Insert;
1556 else 1645 else
1557 screen.flags &= ~Screen_Insert; 1646 screen.flags &= ~Screen_Insert;
… …
1563 * XTERM_SEQ: Set tab at current column : ESC H 1652 * XTERM_SEQ: Set tab at current column : ESC H
1564 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1653 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1565 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1654 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1566 */ 1655 */
1567void 1656void
1568rxvt_term::scr_set_tab (int mode) 1657rxvt_term::scr_set_tab (int mode) NOTHROW
1569{ 1658{
1570 if (mode < 0) 1659 if (mode < 0)
1571 MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); 1660 memset (tabs, 0, ncol);
1572 else if (screen.cur.col < TermWin.ncol) 1661 else if (screen.cur.col < ncol)
1573 tabs[screen.cur.col] = (mode ? 1 : 0); 1662 tabs [screen.cur.col] = !!mode;
1574} 1663}
1575 1664
1576/* ------------------------------------------------------------------------- */ 1665/* ------------------------------------------------------------------------- */
1577/* 1666/*
1578 * Set reverse/normal video 1667 * Set reverse/normal video
1579 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1668 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1580 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1669 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1581 */ 1670 */
1582void 1671void
1583rxvt_term::scr_rvideo_mode (int mode) 1672rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1584{ 1673{
1585 XGCValues gcvalue; 1674 rvideo_mode = on;
1586 1675
1676#ifndef NO_BELL
1677 on ^= rvideo_bell;
1678#endif
1679
1587 if (rvideo != mode) 1680 if (rvideo_state != on)
1588 { 1681 {
1589 rvideo = mode; 1682 rvideo_state = on;
1590 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1683
1591#if defined(XPM_BACKGROUND) 1684 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1685#ifdef HAVE_BG_PIXMAP
1592 if (bgPixmap.pixmap == None) 1686 if (bgPixmap.pixmap == None)
1593#endif 1687#endif
1594#if defined(TRANSPARENT) 1688 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
1595 if (! (Options & Opt_transparent) || am_transparent == 0)
1596#endif
1597 XSetWindowBackground (display->display, TermWin.vt,
1598 PixColors[Color_bg]);
1599 1689
1690 XGCValues gcvalue;
1600 gcvalue.foreground = PixColors[Color_fg]; 1691 gcvalue.foreground = pix_colors[Color_fg];
1601 gcvalue.background = PixColors[Color_bg]; 1692 gcvalue.background = pix_colors[Color_bg];
1602 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1693 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1603 &gcvalue); 1694
1604 scr_clear (); 1695 scr_clear ();
1605 scr_touch (true); 1696 scr_touch (true);
1606 } 1697 }
1607} 1698}
1608 1699
… …
1610/* 1701/*
1611 * Report current cursor position 1702 * Report current cursor position
1612 * XTERM_SEQ: Report position: ESC [ 6 n 1703 * XTERM_SEQ: Report position: ESC [ 6 n
1613 */ 1704 */
1614void 1705void
1615rxvt_term::scr_report_position () 1706rxvt_term::scr_report_position () NOTHROW
1616{ 1707{
1617 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1708 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1618} 1709}
1619 1710
1620/* ------------------------------------------------------------------------- * 1711/* ------------------------------------------------------------------------- *
… …
1623 1714
1624/* 1715/*
1625 * Set font style 1716 * Set font style
1626 */ 1717 */
1627void 1718void
1628rxvt_term::set_font_style () 1719rxvt_term::set_font_style () NOTHROW
1629{ 1720{
1721#if 0
1630 switch (charsets[screen.charset]) 1722 switch (charsets [screen.charset])
1631 { 1723 {
1632 case '0': /* DEC Special Character & Line Drawing Set */ 1724 case '0': /* DEC Special Character & Line Drawing Set */
1633 break; 1725 break;
1634 case 'A': /* United Kingdom (UK) */ 1726 case 'A': /* United Kingdom (UK) */
1635 break; 1727 break;
… …
1642 case 'C': /* Finnish character set */ 1734 case 'C': /* Finnish character set */
1643 break; 1735 break;
1644 case 'K': /* German character set */ 1736 case 'K': /* German character set */
1645 break; 1737 break;
1646 } 1738 }
1739#endif
1647} 1740}
1648 1741
1649/* ------------------------------------------------------------------------- */ 1742/* ------------------------------------------------------------------------- */
1650/* 1743/*
1651 * Choose a font 1744 * Choose a font
… …
1653 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1746 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1654 * XTERM_SEQ: Invoke G2 character set: ESC N 1747 * XTERM_SEQ: Invoke G2 character set: ESC N
1655 * XTERM_SEQ: Invoke G3 character set: ESC O 1748 * XTERM_SEQ: Invoke G3 character set: ESC O
1656 */ 1749 */
1657void 1750void
1658rxvt_term::scr_charset_choose (int set) 1751rxvt_term::scr_charset_choose (int set) NOTHROW
1659 { 1752{
1660 screen.charset = set; 1753 screen.charset = set;
1661 set_font_style (); 1754 set_font_style ();
1662 } 1755}
1663 1756
1664/* ------------------------------------------------------------------------- */ 1757/* ------------------------------------------------------------------------- */
1665/* 1758/*
1666 * Set a font 1759 * Set a font
1667 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1760 * XTERM_SEQ: Set G0 character set: ESC ( <C>
… …
1669 * XTERM_SEQ: Set G2 character set: ESC * <C> 1762 * XTERM_SEQ: Set G2 character set: ESC * <C>
1670 * XTERM_SEQ: Set G3 character set: ESC + <C> 1763 * XTERM_SEQ: Set G3 character set: ESC + <C>
1671 * See set_font_style for possible values for <C> 1764 * See set_font_style for possible values for <C>
1672 */ 1765 */
1673void 1766void
1674rxvt_term::scr_charset_set (int set, unsigned int ch) 1767rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1675 { 1768{
1676 charsets[set] = (unsigned char)ch; 1769 charsets[set] = (unsigned char)ch;
1677 set_font_style (); 1770 set_font_style ();
1678 } 1771}
1679 1772
1680 1773
1681/* ------------------------------------------------------------------------- * 1774/* ------------------------------------------------------------------------- *
1682 * MAJOR SCREEN MANIPULATION * 1775 * MAJOR SCREEN MANIPULATION *
1683 * ------------------------------------------------------------------------- */ 1776 * ------------------------------------------------------------------------- */
1684 1777
1685/* 1778/*
1686 * refresh matching text. 1779 * refresh matching text.
1687 */ 1780 */
1688bool 1781bool
1689rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1782rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1690{ 1783{
1691 bool found = false; 1784 bool found = false;
1692 1785
1693 for (int i = 0; i < TermWin.nrow; i++) 1786 for (int i = 0; i < nrow; i++)
1694 { 1787 {
1695 int col = 0;
1696 rend_t *drp = drawn_rend [i]; 1788 rend_t *drp = drawn_buf[i].r;
1697 1789
1698 for (; col < TermWin.ncol; col++, drp++) 1790 for (int col = 0; col < ncol; col++, drp++)
1699 if ((*drp & mask) == value) 1791 if ((*drp & mask) == value)
1700 { 1792 {
1701 found = true; 1793 found = true;
1702 *drp = ~value; 1794 *drp = ~value;
1703 } 1795 }
… …
1714 PART_END, 1806 PART_END,
1715 RC_COUNT 1807 RC_COUNT
1716}; 1808};
1717 1809
1718void 1810void
1719rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) 1811rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1720{ 1812{
1721 int i; 1813 int i;
1722 row_col_t rc[RC_COUNT]; 1814 row_col_t rc[RC_COUNT];
1723 1815
1724 if (drawn_text == NULL) /* sanity check */ 1816 if (!drawn_buf) /* sanity check */
1725 return; 1817 return;
1726 1818
1727#ifdef DEBUG_STRICT 1819#ifndef NO_SLOW_LINK_SUPPORT
1728 x = max (x, (int)TermWin.int_bwidth); 1820 if (refresh_type == FAST_REFRESH && !display->is_local)
1729 x = min (x, (int)TermWin.width); 1821 {
1730 y = max (y, (int)TermWin.int_bwidth); 1822 y = 0;
1731 y = min (y, (int)TermWin.height); 1823 eheight = height;
1824 }
1732#endif 1825#endif
1733 1826
1734 /* round down */ 1827 /* round down */
1735 rc[PART_BEG].col = Pixel2Col (x); 1828 rc[PART_BEG].col = Pixel2Col (x);
1736 rc[PART_BEG].row = Pixel2Row (y); 1829 rc[PART_BEG].row = Pixel2Row (y);
1737 /* round up */ 1830 /* round up */
1738 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); 1831 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1739 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); 1832 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1740 1833
1741 /* sanity checks */ 1834 /* sanity checks */
1742 for (i = PART_BEG; i < RC_COUNT; i++) 1835 for (i = PART_BEG; i < RC_COUNT; i++)
1743 { 1836 {
1744 MIN_IT (rc[i].col, TermWin.ncol - 1); 1837 min_it (rc[i].col, ncol - 1);
1745 MIN_IT (rc[i].row, TermWin.nrow - 1); 1838 min_it (rc[i].row, nrow - 1);
1746 } 1839 }
1747
1748 D_SCREEN ((stderr, "rxvt_scr_expose (x:%d, y:%d, w:%d, h:%d) area (c:%d,r:%d)- (c:%d,r:%d)", x, y, width, height, rc[PART_BEG].col, rc[PART_BEG].row, rc[PART_END].col, rc[PART_END].row));
1749 1840
1750 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1841 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1751 fill_text (& (drawn_text[i][rc[PART_BEG].col]), 0, 1842 fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1);
1752 (rc[PART_END].col - rc[PART_BEG].col + 1)); 1843
1844 num_scr_allow = 0;
1753 1845
1754 if (refresh) 1846 if (refresh)
1755 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1847 scr_refresh ();
1756} 1848}
1757 1849
1758/* ------------------------------------------------------------------------- */ 1850/* ------------------------------------------------------------------------- */
1759/* 1851/*
1760 * Refresh the entire screen 1852 * Refresh the entire screen
1761 */ 1853 */
1762void 1854void
1763rxvt_term::scr_touch (bool refresh) 1855rxvt_term::scr_touch (bool refresh) NOTHROW
1764{ 1856{
1765 scr_expose (0, 0, TermWin.width, TermWin.height, refresh); 1857 scr_expose (0, 0, width, height, refresh);
1766} 1858}
1767 1859
1768/* ------------------------------------------------------------------------- */ 1860/* ------------------------------------------------------------------------- */
1769/* 1861/*
1770 * Move the display so that the line represented by scrollbar value Y is at 1862 * Move the display so that the line represented by scrollbar value Y is at
1771 * the top of the screen 1863 * the top of the screen
1772 */ 1864 */
1773int 1865void
1774rxvt_term::scr_move_to (int y, int len) 1866rxvt_term::scr_move_to (int y, int len) NOTHROW
1775{ 1867{
1776 long p = 0; 1868 scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1));
1777 uint16_t oldviewstart;
1778
1779 oldviewstart = TermWin.view_start;
1780 if (y < len)
1781 {
1782 p = (TermWin.nrow + TermWin.nscrolled) * (len - y) / len;
1783 p -= (long) (TermWin.nrow - 1);
1784 p = max (p, 0);
1785 }
1786 TermWin.view_start = (uint16_t)min (p, TermWin.nscrolled);
1787 D_SCREEN ((stderr, "rxvt_scr_move_to (%d, %d) view_start:%d", y, len, TermWin.view_start));
1788
1789 return scr_changeview (oldviewstart);
1790} 1869}
1791 1870
1792/* ------------------------------------------------------------------------- */ 1871/* ------------------------------------------------------------------------- */
1793/* 1872/*
1794 * Page the screen up/down nlines 1873 * Page the screen up/down nlines
1795 * direction should be UP or DN 1874 * direction should be UP or DN
1796 */ 1875 */
1797int 1876bool
1798rxvt_term::scr_page (enum page_dirn direction, int nlines) 1877rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1799{ 1878{
1800 int n; 1879 int new_view_start =
1801 uint16_t oldviewstart; 1880 direction == UP ? view_start - nlines
1881 : view_start + nlines;
1802 1882
1803 D_SCREEN ((stderr, "rxvt_scr_page (%s, %d) view_start:%d", ((direction == UP) ? "UP" : "DN"), nlines, TermWin.view_start));
1804#ifdef DEBUG_STRICT
1805 assert ((nlines >= 0) && (nlines <= TermWin.nrow));
1806#endif
1807 oldviewstart = TermWin.view_start;
1808 if (direction == UP)
1809 {
1810 n = TermWin.view_start + nlines;
1811 TermWin.view_start = min (n, TermWin.nscrolled);
1812 }
1813 else
1814 {
1815 n = TermWin.view_start - nlines;
1816 TermWin.view_start = max (n, 0);
1817 }
1818 return scr_changeview (oldviewstart); 1883 return scr_changeview (new_view_start);
1819} 1884}
1820 1885
1821int 1886bool
1822rxvt_term::scr_changeview (uint16_t oldviewstart) 1887rxvt_term::scr_changeview (int new_view_start) NOTHROW
1823{ 1888{
1889 clamp_it (new_view_start, top_row, 0);
1890
1824 if (TermWin.view_start != oldviewstart) 1891 if (new_view_start == view_start)
1825 { 1892 return false;
1893
1894 num_scr += new_view_start - view_start;
1895 view_start = new_view_start;
1826 want_refresh = 1; 1896 want_refresh = 1;
1827 num_scr -= (TermWin.view_start - oldviewstart);
1828 }
1829 return (int) (TermWin.view_start - oldviewstart);
1830}
1831 1897
1832/* ------------------------------------------------------------------------- */ 1898 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1833void 1899
1834rxvt_term::scr_bell () 1900 return true;
1835{ 1901}
1902
1836#ifndef NO_BELL 1903#ifndef NO_BELL
1904void
1905rxvt_term::bell_cb (ev::timer &w, int revents)
1906{
1907 rvideo_bell = false;
1908 scr_rvideo_mode (rvideo_mode);
1909 refresh_check ();
1910}
1911#endif
1912
1913/* ------------------------------------------------------------------------- */
1914void
1915rxvt_term::scr_bell () NOTHROW
1916{
1917#ifndef NO_BELL
1918
1837# ifndef NO_MAPALERT 1919# ifndef NO_MAPALERT
1838# ifdef MAPALERT_OPTION 1920# ifdef MAPALERT_OPTION
1839 if (Options & Opt_mapAlert) 1921 if (option (Opt_mapAlert))
1840# endif 1922# endif
1841 XMapWindow (display->display, TermWin.parent[0]); 1923 XMapWindow (dpy, parent[0]);
1842# endif 1924# endif
1925
1926# if ENABLE_FRILLS
1927 if (option (Opt_urgentOnBell))
1928 set_urgency (1);
1929# endif
1930
1843 if (Options & Opt_visualBell) 1931 if (option (Opt_visualBell))
1844 { 1932 {
1845 scr_rvideo_mode (!rvideo); /* refresh also done */ 1933 rvideo_bell = true;
1846 scr_rvideo_mode (!rvideo); /* refresh also done */ 1934 scr_rvideo_mode (rvideo_mode);
1935 flush ();
1936
1937 bell_ev.start (VISUAL_BELL_DURATION);
1847 } 1938 }
1848 else 1939 else
1849 XBell (display->display, 0); 1940 XBell (dpy, 0);
1941 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1850#endif 1942#endif
1851} 1943}
1852 1944
1853/* ------------------------------------------------------------------------- */ 1945/* ------------------------------------------------------------------------- */
1854/* ARGSUSED */ 1946/* ARGSUSED */
1855void 1947void
1856rxvt_term::scr_printscreen (int fullhist) 1948rxvt_term::scr_printscreen (int fullhist) NOTHROW
1857{ 1949{
1858#ifdef PRINTPIPE 1950#ifdef PRINTPIPE
1859 int i, r1, nrows, row_offset; 1951 int nrows, row_start;
1860 text_t *t; 1952 FILE *fd = popen_printer ();
1861 FILE *fd;
1862 1953
1863 if ((fd = popen_printer ()) == NULL) 1954 if (!fd)
1864 return; 1955 return;
1865 nrows = TermWin.nrow; 1956
1866 row_offset = TermWin.saveLines;
1867 if (!fullhist) 1957 if (fullhist)
1868 row_offset -= TermWin.view_start; 1958 {
1959 nrows = nrow - top_row;
1960 row_start = top_row;
1961 }
1869 else 1962 else
1870 { 1963 {
1871 nrows += TermWin.nscrolled; 1964 nrows = nrow;
1872 row_offset -= TermWin.nscrolled; 1965 row_start = view_start;
1873 }
1874
1875 for (r1 = 0; r1 < nrows; r1++)
1876 { 1966 }
1877 t = screen.text[r1 + row_offset]; 1967
1878 for (i = TermWin.ncol - 1; i >= 0; i--) 1968 wctomb (0, 0);
1879 if (!isspace (t[i])) 1969
1880 break; 1970 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1881 fprintf (fd, "%.*s\n", (i + 1), t);
1882 } 1971 {
1972 text_t *tp = ROW(r1).t;
1973 int len = ROW(r1).l;
1974
1975 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1976 {
1977 char mb[MB_LEN_MAX];
1978 text_t t = *tp++;
1979 if (t == NOCHAR)
1980 continue;
1981
1982 len = wctomb (mb, t);
1983
1984 if (len <= 0)
1985 {
1986 mb[0] = ' ';
1987 len = 1;
1988 }
1989
1990 fwrite (mb, 1, len, fd);
1991 }
1992
1993 fputc ('\n', fd);
1994 }
1995
1883 pclose_printer (fd); 1996 pclose_printer (fd);
1884#endif 1997#endif
1885} 1998}
1886 1999
1887/* ------------------------------------------------------------------------- */ 2000/* ------------------------------------------------------------------------- */
1888/* 2001/*
1889 * Refresh the screen 2002 * Refresh the screen
1890 * drawn_text/drawn_rend contain the screen information before the update. 2003 * drawn_text/drawn_rend contain the screen information before the update.
1891 * screen.text/screen.rend contain what the screen will change to. 2004 * screen.text/screen.rend contain what the screen will change to.
1892 */ 2005 */
1893
1894#define FONT_WIDTH(X, Y) \
1895 (X)->per_char[ (Y) - (X)->min_char_or_byte2].width
1896#define FONT_RBEAR(X, Y) \
1897 (X)->per_char[ (Y) - (X)->min_char_or_byte2].rbearing
1898#define FONT_LBEAR(X, Y) \
1899 (X)->per_char[ (Y) - (X)->min_char_or_byte2].lbearing
1900#define IS_FONT_CHAR(X, Y) \
1901 ((Y) >= (X)->min_char_or_byte2 && (Y) <= (X)->max_char_or_byte2)
1902
1903void 2006void
1904rxvt_term::scr_refresh (unsigned char refresh_type) 2007rxvt_term::scr_refresh () NOTHROW
1905{ 2008{
1906 unsigned char clearfirst, /* first character writes before cell */
1907 clearlast, /* last character writes beyond cell */
1908 must_clear, /* use draw_string not draw_image_string */
1909 rvid, /* reverse video this position */
1910 showcursor; /* show the cursor */
1911 int16_t col, row, /* column/row we're processing */ 2009 int16_t col, row, /* column/row we're processing */
1912 ocrow; /* old cursor row */ 2010 ocrow; /* old cursor row */
1913 int i, /* tmp */ 2011 int i; /* tmp */
1914 row_offset; /* basic offset in screen structure */
1915#ifndef NO_CURSORCOLOR 2012#ifndef NO_CURSORCOLOR
1916 rend_t cc1; /* store colours at cursor position (s) */ 2013 rend_t cc1; /* store colours at cursor position (s) */
1917#endif 2014#endif
1918 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 2015 rend_t *crp; // cursor rendition pointer
1919 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 2016 rend_t ccol1, /* Cursor colour */
2017 ccol2; /* Cursor colour2 */
1920 2018
2019 want_refresh = 0; /* screen is current */
2020
1921 if (refresh_type == NO_REFRESH || !TermWin.mapped) 2021 if (refresh_type == NO_REFRESH || !mapped)
1922 return; 2022 return;
1923 2023
1924 /* 2024 /*
1925 * A: set up vars 2025 * A: set up vars
1926 */ 2026 */
1927 clearfirst = clearlast = must_clear = 0;
1928
1929 refresh_count = 0; 2027 refresh_count = 0;
1930 2028
1931 row_offset = TermWin.saveLines - TermWin.view_start; 2029 unsigned int old_screen_flags = screen.flags;
1932 2030 char have_bg = 0;
1933 if ((refresh_type & REFRESH_BOUNDS)) 2031#ifdef HAVE_BG_PIXMAP
1934 { 2032 have_bg = bgPixmap.pixmap != None;
1935 clearfirst = clearlast = 1;
1936 refresh_type &= ~REFRESH_BOUNDS;
1937 }
1938
1939#ifdef XPM_BACKGROUND
1940 must_clear |= (bgPixmap.pixmap != None);
1941#endif
1942#ifdef TRANSPARENT
1943 must_clear |= ((Options & Opt_transparent) && am_transparent);
1944#endif 2033#endif
1945 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2034 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1946 2035
1947 /* 2036 /*
1948 * B: reverse any characters which are selected 2037 * B: reverse any characters which are selected
1949 */ 2038 */
1950 scr_reverse_selection (); 2039 scr_reverse_selection ();
1951 2040
2041 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2042#if ENABLE_OVERLAY
2043 scr_swap_overlay ();
2044#endif
2045
2046 char showcursor = screen.flags & Screen_VisibleCursor;
2047
1952 /* 2048 /*
1953 * C: set the cursor character (s) 2049 * C: set the cursor character (s)
1954 */ 2050 */
1955 { 2051 {
1956 unsigned char setoldcursor; 2052 unsigned char setoldcursor;
1957 rend_t ccol1, /* Cursor colour */
1958 ccol2; /* Cursor colour2 */
1959 2053
1960 showcursor = (screen.flags & Screen_VisibleCursor);
1961#ifdef CURSOR_BLINK 2054#ifdef CURSOR_BLINK
1962 if (hidden_cursor) 2055 if (hidden_cursor)
1963 showcursor = 0; 2056 showcursor = 0;
1964#endif 2057#endif
1965 2058
1966 if (showcursor) 2059 if (showcursor)
1967 { 2060 {
1968 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 2061 int col = screen.cur.col;
1969 [screen.cur.col]);
1970 2062
1971 if (showcursor && TermWin.focus) 2063 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2064 col--;
2065
2066 crp = &ROW(screen.cur.row).r[col];
2067
2068#ifndef NO_CURSORCOLOR
2069 cc1 = *crp & (RS_fgMask | RS_bgMask);
2070 if (ISSET_PIXCOLOR (Color_cursor))
2071 ccol1 = Color_cursor;
2072 else
2073#endif
2074#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2075 ccol1 = fgcolor_of (rstyle);
2076#else
2077 ccol1 = Color_fg;
2078#endif
2079
2080#ifndef NO_CURSORCOLOR
2081 if (ISSET_PIXCOLOR (Color_cursor2))
2082 ccol2 = Color_cursor2;
2083 else
2084#endif
2085#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2086 ccol2 = bgcolor_of (rstyle);
2087#else
2088 ccol2 = Color_bg;
2089#endif
2090
2091 if (focus)
1972 { 2092 {
2093 if (option (Opt_cursorUnderline))
1973 *srp ^= RS_RVid; 2094 *crp ^= RS_Uline;
1974#ifndef NO_CURSORCOLOR
1975 cc1 = *srp & (RS_fgMask | RS_bgMask);
1976 if (ISSET_PIXCOLOR (Color_cursor))
1977 ccol1 = Color_cursor;
1978 else 2095 else
1979#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
1980 ccol1 = GET_FGCOLOR (rstyle);
1981#else
1982 ccol1 = Color_fg;
1983#endif
1984 if (ISSET_PIXCOLOR (Color_cursor2))
1985 ccol2 = Color_cursor2;
1986 else 2096 {
1987#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2097 *crp ^= RS_RVid;
1988 ccol2 = GET_BGCOLOR (rstyle);
1989#else
1990 ccol2 = Color_bg;
1991#endif
1992 *srp = SET_FGCOLOR (*srp, ccol1); 2098 *crp = SET_FGCOLOR (*crp, ccol1);
1993 *srp = SET_BGCOLOR (*srp, ccol2); 2099 *crp = SET_BGCOLOR (*crp, ccol2);
1994#endif 2100 }
1995 } 2101 }
1996 } 2102 }
1997 2103
1998 /* make sure no outline cursor is left around */ 2104 /* make sure no outline cursor is left around */
1999 setoldcursor = 0; 2105 setoldcursor = 0;
2000 if (ocrow != -1) 2106 if (ocrow != -1)
2001 { 2107 {
2002 if (screen.cur.row + TermWin.view_start != ocrow 2108 if (screen.cur.row - view_start != ocrow
2003 || screen.cur.col != oldcursor.col) 2109 || screen.cur.col != oldcursor.col)
2004 { 2110 {
2005 if (ocrow < TermWin.nrow 2111 if (ocrow < nrow
2006 && oldcursor.col < TermWin.ncol) 2112 && oldcursor.col < ncol)
2007 {
2008 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2113 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
2009 } 2114
2010 if (TermWin.focus || !showcursor) 2115 if (focus || !showcursor)
2011 oldcursor.row = -1; 2116 oldcursor.row = -1;
2012 else 2117 else
2013 setoldcursor = 1; 2118 setoldcursor = 1;
2014 } 2119 }
2015 } 2120 }
2016 else if (!TermWin.focus) 2121 else if (!focus)
2017 setoldcursor = 1; 2122 setoldcursor = 1;
2123
2018 if (setoldcursor) 2124 if (setoldcursor)
2019 { 2125 {
2020 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2126 if (screen.cur.row - view_start >= nrow)
2021 oldcursor.row = -1; 2127 oldcursor.row = -1;
2022 else 2128 else
2023 { 2129 {
2024 oldcursor.row = screen.cur.row + TermWin.view_start; 2130 oldcursor.row = screen.cur.row - view_start;
2025 oldcursor.col = screen.cur.col; 2131 oldcursor.col = screen.cur.col;
2026 } 2132 }
2027 } 2133 }
2028 } 2134 }
2029 2135
2030#ifndef NO_SLOW_LINK_SUPPORT 2136#ifndef NO_SLOW_LINK_SUPPORT
2031 /* 2137 /*
2032 * D: CopyArea pass - very useful for slower links 2138 * D: CopyArea pass - very useful for slower links
2033 * This has been deliberately kept simple. 2139 * This has been deliberately kept simple.
2034 */ 2140 */
2035 i = num_scr; 2141 if (!display->is_local
2036 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2142 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
2037 && abs (i) < TermWin.nrow && !must_clear) 2143 && abs (num_scr) < nrow && !have_bg)
2038 { 2144 {
2039 int16_t nits; 2145 int16_t nits;
2040 int j; 2146 int i = num_scr;
2041 rend_t *drp2; 2147 int j;
2042 text_t *dtp2;
2043 int len, wlen; 2148 int len, wlen;
2149 dLocal (int, num_scr);
2044 2150
2045 j = TermWin.nrow; 2151 j = nrow;
2046 wlen = len = -1; 2152 wlen = len = -1;
2047 row = i > 0 ? 0 : j - 1; 2153 row = i > 0 ? 0 : j - 1;
2154
2048 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2155 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2049 { 2156 {
2050 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2157 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2051 { 2158 {
2052 stp = screen.text[row + row_offset]; 2159 line_t s = ROW(view_start + row);
2053 srp = screen.rend[row + row_offset];
2054 dtp = drawn_text[row]; 2160 line_t d = drawn_buf[row];
2055 dtp2 = drawn_text[row + i]; 2161 line_t d2 = drawn_buf[row + i];
2056 drp = drawn_rend[row];
2057 drp2 = drawn_rend[row + i];
2058 2162
2059 for (nits = 0, col = TermWin.ncol; col--; ) 2163 for (nits = 0, col = ncol; col--; )
2060 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2164 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2061 nits--; 2165 nits--;
2062 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2166 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
2063 nits++; 2167 nits++;
2064 2168
2065 if (nits > 8) /* XXX: arbitrary choice */ 2169 if (nits > 8) /* XXX: arbitrary choice */
2066 { 2170 {
2067 for (col = TermWin.ncol; col--; ) 2171 for (col = ncol; col--; )
2068 { 2172 {
2069 *dtp++ = *dtp2++; 2173 *d.t++ = *d2.t++;
2070 *drp++ = *drp2++; 2174 *d.r++ = *d2.r++;
2071 } 2175 }
2072 2176
2073 if (len == -1) 2177 if (len == -1)
2074 len = row; 2178 len = row;
2075 2179
2076 wlen = row; 2180 wlen = row;
2077 continue; 2181 continue;
2078 } 2182 }
2079 } 2183 }
2080 2184
2081 if (len != -1) 2185 if (len >= 0)
2082 { 2186 {
2083 /* also comes here at end if needed because of >= above */ 2187 /* also comes here at end if needed because of >= above */
2084 if (wlen < len) 2188 if (wlen < len)
2085 SWAP_IT (wlen, len, int); 2189 ::swap (wlen, len);
2086 2190
2087 D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1)); 2191 XGCValues gcv;
2088 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2192
2193 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2194 XCopyArea (dpy, vt, vt,
2089 TermWin.gc, 0, Row2Pixel (len + i), 2195 gc, 0, Row2Pixel (len + i),
2090 (unsigned int)TermWin_TotalWidth (), 2196 (unsigned int)this->width,
2091 (unsigned int)Height2Pixel (wlen - len + 1), 2197 (unsigned int)Height2Pixel (wlen - len + 1),
2092 0, Row2Pixel (len)); 2198 0, Row2Pixel (len));
2199 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2200
2093 len = -1; 2201 len = -1;
2094 } 2202 }
2095 } 2203 }
2096 } 2204 }
2097#endif 2205#endif
2098 2206
2099 /* 2207 /*
2100 * E: main pass across every character 2208 * E: main pass across every character
2101 */ 2209 */
2102 for (row = 0; row < TermWin.nrow; row++) 2210 for (row = 0; row < nrow; row++)
2103 { 2211 {
2104 stp = screen.text[row + row_offset]; 2212 text_t *stp = ROW(view_start + row).t;
2105 srp = screen.rend[row + row_offset]; 2213 rend_t *srp = ROW(view_start + row).r;
2106 dtp = drawn_text[row]; 2214 text_t *dtp = drawn_buf[row].t;
2107 drp = drawn_rend[row]; 2215 rend_t *drp = drawn_buf[row].r;
2108 2216
2109 /* 2217 /*
2110 * E2: OK, now the real pass 2218 * E2: OK, now the real pass
2111 */ 2219 */
2112 int ypixel = (int)Row2Pixel (row); 2220 int ypixel = (int)Row2Pixel (row);
2113 2221
2114 for (col = 0; col < TermWin.ncol; col++) 2222 for (col = 0; col < ncol; col++)
2115 { 2223 {
2116 /* compare new text with old - if exactly the same then continue */ 2224 /* compare new text with old - if exactly the same then continue */
2117 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2225 if (stp[col] == dtp[col] /* Must match characters to skip. */
2118 && (srp[col] == drp[col] /* Either rendition the same or */ 2226 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2119 || (stp[col] == ' ' /* space w/ no background change */ 2227 || (stp[col] == ' ' /* space w/ no background change */
2120 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2228 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2121 continue; 2229 continue;
2122 2230
2123 // redraw one or more characters 2231 // redraw one or more characters
2124 2232
2125 // seek to the beginning if wide characters 2233 // seek to the beginning of wide characters
2126 while (stp[col] == NOCHAR && col > 0) 2234 while (expect_false (stp[col] == NOCHAR && col > 0))
2127 --col; 2235 --col;
2128 2236
2129 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2237 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2130 text_t *text = stp + col; 2238 text_t *text = stp + col;
2131 int count = 1; 2239 int count = 1;
2132 2240
2133 dtp[col] = stp[col]; 2241 dtp[col] = stp[col];
2134 drp[col] = rend; 2242 drp[col] = rend;
2135 2243
2136 int xpixel = Col2Pixel (col); 2244 int xpixel = Col2Pixel (col);
2137 2245
2138 // this loop looks very messy, it can probably be optimized
2139 // and cleaned a bit by you?
2140 for (i = 0; ++col < TermWin.ncol; ) 2246 for (i = 0; ++col < ncol; )
2141 { 2247 {
2142 if (stp[col] == NOCHAR) 2248 if (stp[col] == NOCHAR)
2143 { 2249 {
2144 dtp[col] = stp[col]; 2250 dtp[col] = stp[col];
2145 drp[col] = rend; 2251 drp[col] = srp[col];
2252
2146 count++; 2253 count++;
2147
2148 if (i) // only possible skip if char unchanged
2149 i++; 2254 i++;
2150 2255
2151 continue; 2256 continue;
2152 } 2257 }
2153 2258
2154 if (rend != srp[col]) 2259 if (!RS_SAME (rend, srp[col]))
2155 break; 2260 break;
2156 2261
2157 count++; 2262 count++;
2158 2263
2159 if (stp[col] != dtp[col] 2264 if (stp[col] != dtp[col]
2160 || srp[col] != drp[col]) 2265 || !RS_SAME (srp[col], drp[col]))
2161 { 2266 {
2162 if (must_clear && (i++ > (count / 2))) 2267 if (have_bg && (i++ > count / 2))
2163 break; 2268 break;
2164 2269
2165 dtp[col] = stp[col]; 2270 dtp[col] = stp[col];
2166 drp[col] = rend; 2271 drp[col] = rend;
2167 i = 0; 2272 i = 0;
2168 } 2273 }
2169 else if (must_clear || (stp[col] != ' ' && ++i >= 32)) 2274 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2170 break; 2275 break;
2171 } 2276 }
2172 2277
2173 col--; /* went one too far. move back */ 2278 col--; /* went one too far. move back */
2174 count -= i; /* dump any matching trailing chars */ 2279 count -= i; /* dump any matching trailing chars */
2280
2281 // sometimes we optimize away the trailing NOCHAR's, add them back
2282 while (expect_false (i && text[count] == NOCHAR))
2283 count++, i--;
2175 2284
2176 /* 2285 /*
2177 * Determine the attributes for the string 2286 * Determine the attributes for the string
2178 */ 2287 */
2179 int fid = GET_FONT (rend);
2180 int fore = GET_FGCOLOR (rend); // desired foreground 2288 int fore = fgcolor_of (rend); // desired foreground
2181 int back = GET_BGCOLOR (rend); // desired background 2289 int back = bgcolor_of (rend); // desired background
2182 2290
2183 rend = GET_ATTR (rend); 2291 // only do special processing if any attributes are set, which is unlikely
2184 2292 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2185 rvid = !!(rend & RS_RVid); 2293 {
2294 bool invert = rend & RS_RVid;
2186 2295
2187#ifndef NO_BOLD_UNDERLINE_REVERSE 2296#ifndef NO_BOLD_UNDERLINE_REVERSE
2188 if (rend & RS_Bold && fore == Color_fg) 2297 if (rend & RS_Bold && fore == Color_fg)
2189 { 2298 {
2190 if (ISSET_PIXCOLOR (Color_BD)) 2299 if (ISSET_PIXCOLOR (Color_BD))
2191 fore = Color_BD; 2300 fore = Color_BD;
2301# if !ENABLE_STYLES
2192 else 2302 else
2193 rvid = !rvid; 2303 invert = !invert;
2304# endif
2305 }
2306
2307 if (rend & RS_Italic && fore == Color_fg)
2308 {
2309 if (ISSET_PIXCOLOR (Color_IT))
2310 fore = Color_IT;
2311# if !ENABLE_STYLES
2312 else
2313 invert = !invert;
2314# endif
2315 }
2316
2317 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2318 fore = Color_UL;
2319#endif
2320
2321#ifdef OPTION_HC
2322 if (rend & RS_Sel)
2323 {
2324 /* invert the column if no highlightColor is set or it is the
2325 * current cursor column */
2326 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2327 && ISSET_PIXCOLOR (Color_HC))
2328 {
2329 if (ISSET_PIXCOLOR (Color_HTC))
2330 fore = Color_HTC;
2331 // if invert is 0 reverse video is set so we use bg color as fg color
2332 else if (!invert)
2333 fore = back;
2334
2335 back = Color_HC;
2336 invert = 0;
2337 }
2338 }
2339#endif
2340
2341 if (invert)
2342 {
2343 ::swap (fore, back);
2344
2345#ifndef NO_BOLD_UNDERLINE_REVERSE
2346 if (fore == back)
2347 {
2348 fore = Color_bg;
2349 back = Color_fg;
2350 }
2351#endif
2352 }
2353
2354#ifdef TEXT_BLINK
2355 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2356 {
2357 if (!text_blink_ev.is_active ())
2358 {
2359 text_blink_ev.again ();
2360 hidden_text = 0;
2361 }
2362 else if (hidden_text)
2363 fore = back;
2364 }
2365#endif
2366
2367#if ENABLE_STYLES
2368 // "careful" (too wide) character handling
2369
2370 // include previous careful character(s) if possible, looks nicer (best effort...)
2371 while (text > stp
2372 && srp[text - stp - 1] & RS_Careful
2373 && RS_SAME (rend, srp[text - stp - 1]))
2374 text--, count++, xpixel -= fwidth;
2375
2376 // force redraw after "careful" characters to avoid pixel droppings
2377 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2378 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2379
2380 // force redraw before "careful" characters to avoid pixel droppings
2381 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2382 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2383#endif
2194 } 2384 }
2195
2196 if (rend & RS_Uline)
2197 {
2198 if (ISSET_PIXCOLOR (Color_UL))
2199 fore = Color_UL;
2200 }
2201#endif
2202
2203 if (rvid)
2204 {
2205 SWAP_IT (fore, back, int);
2206
2207#ifndef NO_BOLD_UNDERLINE_REVERSE
2208 if (ISSET_PIXCOLOR (Color_RV)
2209# ifndef NO_CURSORCOLOR
2210 && !ISSET_PIXCOLOR (Color_cursor)
2211# endif
2212 )
2213 back = Color_RV;
2214#endif
2215 }
2216
2217#ifdef TEXT_BLINK
2218 if (rend & RS_Blink && back == Color_bg)
2219 {
2220 if (!text_blink_ev.active)
2221 {
2222 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
2223 hidden_text = 0;
2224 }
2225 else if (hidden_text)
2226 fore = back;
2227 }
2228#endif
2229 2385
2230 /* 2386 /*
2231 * Actually do the drawing of the string here 2387 * Actually do the drawing of the string here
2232 */ 2388 */
2233 rxvt_font *font = (*TermWin.fontset)[fid]; 2389 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2234 2390
2235 if (back == fore) 2391 if (expect_true (have_bg && back == Color_bg))
2236 font->clear_rect (*TermWin.drawable, xpixel, ypixel,
2237 TermWin.fwidth * count, TermWin.fheight,
2238 back);
2239 else if (back == Color_bg)
2240 { 2392 {
2241 if (must_clear) 2393 // this is very ugly, maybe push it into ->draw?
2242 {
2243 CLEAR_CHARS (xpixel, ypixel, count);
2244 2394
2245 for (i = 0; i < count; i++) /* don't draw empty strings */ 2395 for (i = 0; i < count; i++) /* don't draw empty strings */
2246 if (text[i] != ' ') 2396 if (text[i] != ' ')
2247 { 2397 {
2248 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); 2398 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2249 break; 2399 goto did_clear;
2250 }
2251 } 2400 }
2252 else 2401
2253 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2402 CLEAR_CHARS (xpixel, ypixel, count);
2403 did_clear: ;
2254 } 2404 }
2255 else 2405 else
2256 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2406 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2257 2407
2258 if ((rend & RS_Uline) && (font->descent > 1)) 2408 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2259 XDrawLine (display->display, drawBuffer, TermWin.gc, 2409 {
2410#if ENABLE_FRILLS
2411 if (ISSET_PIXCOLOR (Color_underline))
2412 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2413 else
2414#endif
2415 XSetForeground (dpy, gc, pix_colors[fore]);
2416
2417 XDrawLine (dpy, vt, gc,
2260 xpixel, ypixel + font->ascent + 1, 2418 xpixel, ypixel + font->ascent + 1,
2261 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2419 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2420 }
2262 } /* for (col....) */ 2421 } /* for (col....) */
2263 } /* for (row....) */ 2422 } /* for (row....) */
2264 2423
2265 /* 2424 /*
2266 * G: cleanup cursor and display outline cursor if necessary 2425 * G: cleanup cursor and display outline cursor if necessary
2267 */ 2426 */
2268 if (showcursor) 2427 if (showcursor)
2269 { 2428 {
2270 if (TermWin.focus) 2429 if (focus)
2430 {
2431 if (option (Opt_cursorUnderline))
2432 *crp ^= RS_Uline;
2433 else
2271 { 2434 {
2272 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
2273 [screen.cur.col]);
2274 *srp ^= RS_RVid; 2435 *crp ^= RS_RVid;
2275#ifndef NO_CURSORCOLOR 2436#ifndef NO_CURSORCOLOR
2276 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2437 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2277#endif 2438#endif
2439 }
2278 } 2440 }
2279 else if (oldcursor.row >= 0) 2441 else if (oldcursor.row >= 0)
2280 { 2442 {
2443 int cursorwidth = 1;
2444 int col = oldcursor.col;
2445
2446 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2447 col--;
2448
2449 while (col + cursorwidth < ncol
2450 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2451 cursorwidth++;
2452
2281#ifndef NO_CURSORCOLOR 2453#ifndef NO_CURSORCOLOR
2282 if (ISSET_PIXCOLOR (Color_cursor)) 2454 if (ISSET_PIXCOLOR (Color_cursor))
2283 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2455 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2456 else
2284#endif 2457#endif
2285 int cursorwidth = 1; 2458 XSetForeground (dpy, gc, pix_colors[ccol1]);
2286 while (oldcursor.col + cursorwidth < TermWin.ncol
2287 && drawn_text[oldcursor.row][oldcursor.col + cursorwidth] == NOCHAR)
2288 cursorwidth++;
2289 2459
2290 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2460 XDrawRectangle (dpy, vt, gc,
2291 Col2Pixel (oldcursor.col), 2461 Col2Pixel (col),
2292 Row2Pixel (oldcursor.row), 2462 Row2Pixel (oldcursor.row),
2293 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2463 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2294 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2464 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2295 } 2465 }
2296 } 2466 }
2297 2467
2298 /* 2468 /*
2299 * H: cleanup selection 2469 * H: cleanup selection
2300 */ 2470 */
2471#if ENABLE_OVERLAY
2472 scr_swap_overlay ();
2473#endif
2474 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2475
2301 scr_reverse_selection (); 2476 scr_reverse_selection ();
2302 2477
2303 /* 2478 screen.flags = old_screen_flags;
2304 * I: other general cleanup
2305 */
2306 if (clearfirst && TermWin.int_bwidth)
2307 /*
2308 * clear the whole screen height, note that width == 0 is treated
2309 * specially by XClearArea
2310 */
2311 XClearArea (display->display, TermWin.vt, 0, 0,
2312 (unsigned int)TermWin.int_bwidth,
2313 (unsigned int)TermWin_TotalHeight (), False);
2314
2315 if (clearlast && TermWin.int_bwidth)
2316 /*
2317 * clear the whole screen height, note that width == 0 is treated
2318 * specially by XClearArea
2319 */
2320 XClearArea (display->display, TermWin.vt,
2321 TermWin.width + TermWin.int_bwidth, 0,
2322 (unsigned int)TermWin.int_bwidth,
2323 (unsigned int)TermWin_TotalHeight (), False);
2324
2325 if (refresh_type & SMOOTH_REFRESH)
2326 XSync (display->display, False);
2327
2328 num_scr = 0; 2479 num_scr = 0;
2329 num_scr_allow = 1; 2480 num_scr_allow = 1;
2330 want_refresh = 0; /* screen is current */
2331} 2481}
2332 2482
2333void 2483void
2334rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2484rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2335{ 2485{
2336 if (!rp || !tp) 2486 if (!l.t)
2337 return; 2487 return;
2338 2488
2339 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2489 l.touch (); // maybe a bit of an overkill, but it's not performance-relevant
2340 *rp = SET_FONT (*rp, TermWin.fontset->find_font (*tp));
2341}
2342 2490
2491 for (int i = ncol; i--; )
2492 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2493}
2494
2343void 2495void
2344rxvt_term::scr_remap_chars () 2496rxvt_term::scr_remap_chars () NOTHROW
2345{ 2497{
2346 for (int i = TermWin.nrow + TermWin.saveLines; i--; ) 2498 for (int i = total_rows; i--; )
2347 scr_remap_chars (screen.text[i], screen.rend[i]); 2499 scr_remap_chars (row_buf [i]);
2348 2500
2349 for (int i = TermWin.nrow; i--; ) 2501 for (int i = nrow; i--; )
2502 {
2503 scr_remap_chars (drawn_buf [i]);
2504 scr_remap_chars (swap_buf [i]);
2505 }
2506}
2507
2508void
2509rxvt_term::scr_recolour () NOTHROW
2510{
2511#ifdef HAVE_BG_PIXMAP
2512 bgPixmap.apply ();
2513#else
2514
2515 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2516 XClearWindow (dpy, parent[0]);
2517 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2518
2519 if (scrollBar.win)
2350 { 2520 {
2351 scr_remap_chars (drawn_text[i], drawn_rend[i]); 2521 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2352 scr_remap_chars (swap.text[i], swap.rend[i]); 2522 scrollBar.state = STATE_IDLE;
2523 scrollBar.show (0);
2353 } 2524 }
2354}
2355 2525
2526#endif
2527
2528 /* bgPixmap.apply () does not do the following : */
2529 scr_clear ();
2530 scr_touch (true);
2531 want_refresh = 1;
2532}
2533
2356/* ------------------------------------------------------------------------- */ 2534/* ------------------------------------------------------------------------- */
2357void 2535void
2358rxvt_term::scr_clear (bool really) 2536rxvt_term::scr_clear (bool really) NOTHROW
2359{ 2537{
2360 if (!TermWin.mapped) 2538 if (!mapped)
2361 return; 2539 return;
2362 2540
2363 num_scr_allow = 0; 2541 num_scr_allow = 0;
2364 want_refresh = 1; 2542 want_refresh = 1;
2365 2543
2366#ifdef TRANSPARENT 2544 if (really)
2367 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2545 XClearWindow (dpy, vt);
2546}
2547
2548void
2549rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2550{
2551 int view_end = view_start + nrow;
2552 int row, col;
2553
2554 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2555 {
2556 text_t *stp = ROW(row).t;
2557 rend_t *srp = ROW(row).r;
2558
2559 for (col = beg_col; col < end_col; col++)
2560 srp[col] ^= rstyle1;
2561
2562 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2563 srp[col] ^= rstyle2;
2564
2565 if (++col < end_col)
2566 srp[col] ^= rstyle2;
2368 { 2567 }
2369 int i; 2568}
2370 2569
2371 if (! (Options & Opt_transparent_all)) 2570void
2571rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2572{
2573 int view_end = view_start + nrow;
2574 int row, col;
2575
2576 if (beg_row >= view_start)
2577 {
2578 col = beg_col;
2579 row = beg_row;
2580 }
2581 else
2582 {
2372 i = 0; 2583 col = 0;
2584 row = view_start;
2585 }
2586
2587 for (; row < min (end_row, view_end); row++, col = 0)
2588 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2589 srp[col] ^= rstyle;
2590
2591 if (row == end_row)
2592 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2593 srp[col] ^= rstyle;
2594}
2595
2596/* ------------------------------------------------------------------------- */
2597void
2598rxvt_term::scr_reverse_selection () NOTHROW
2599{
2600 if (selection.op
2601 && current_screen == selection.screen
2602 && selection.end.row >= view_start)
2603 {
2604#if !ENABLE_MINIMAL
2605 if (selection.rect)
2606 scr_xor_rect (selection.beg.row, selection.beg.col,
2607 selection.end.row, selection.end.col,
2608 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2373 else 2609 else
2374 i = (int) (sizeof (TermWin.parent) / sizeof (Window));
2375
2376 while (i--)
2377 if (TermWin.parent[i] != None)
2378 XClearWindow (display->display, TermWin.parent[i]);
2379 }
2380#endif 2610#endif
2381 2611 scr_xor_span (selection.beg.row, selection.beg.col,
2382 if (really) 2612 selection.end.row, selection.end.col,
2383 XClearWindow (display->display, TermWin.vt); 2613 RS_Sel | RS_RVid);
2384}
2385
2386/* ------------------------------------------------------------------------- */
2387void
2388rxvt_term::scr_reverse_selection ()
2389{
2390 if (selection.op && current_screen == selection.screen)
2391 {
2392 int end_row = TermWin.saveLines - TermWin.view_start;
2393 int i = selection.beg.row + TermWin.saveLines;
2394 int col, row = selection.end.row + TermWin.saveLines;
2395 rend_t *srp;
2396
2397 if (i >= end_row)
2398 col = selection.beg.col;
2399 else
2400 {
2401 col = 0;
2402 i = end_row;
2403 }
2404
2405 end_row += TermWin.nrow;
2406 for (; i < row && i < end_row; i++, col = 0)
2407 for (srp = screen.rend[i]; col < TermWin.ncol; col++)
2408 srp[col] ^= RS_RVid;
2409
2410 if (i == row && i < end_row)
2411 for (srp = screen.rend[i]; col < selection.end.col; col++)
2412 srp[col] ^= RS_RVid;
2413 } 2614 }
2414} 2615}
2415 2616
2416/* ------------------------------------------------------------------------- */ 2617/* ------------------------------------------------------------------------- */
2417/* 2618/*
2418 * Dump the whole scrollback and screen to the passed filedescriptor. The 2619 * Dump the whole scrollback and screen to the passed filedescriptor. The
2419 * invoking routine must close the fd. 2620 * invoking routine must close the fd.
2420 */ 2621 */
2421#if 0 2622#if 0
2422void 2623void
2423rxvt_term::scr_dump (int fd) 2624rxvt_term::scr_dump (int fd) NOTHROW
2424{ 2625{
2425 int row, wrote; 2626 int row, wrote;
2426 unsigned int width, towrite; 2627 unsigned int width, towrite;
2427 char r1[] = "\n"; 2628 char r1[] = "\n";
2428 2629
2429 for (row = TermWin.saveLines - TermWin.nscrolled; 2630 for (row = saveLines + top_row;
2430 row < TermWin.saveLines + TermWin.nrow - 1; row++) 2631 row < saveLines + nrow - 1; row++)
2431 { 2632 {
2432 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2633 width = row_buf[row].l >= 0 ? row_buf[row].l
2433 : TermWin.ncol; 2634 : ncol;
2434 for (towrite = width; towrite; towrite -= wrote) 2635 for (towrite = width; towrite; towrite -= wrote)
2435 { 2636 {
2436 wrote = write (fd, & (screen.text[row][width - towrite]), 2637 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2437 towrite); 2638 towrite);
2438 if (wrote < 0) 2639 if (wrote < 0)
2439 return; /* XXX: death, no report */ 2640 return; /* XXX: death, no report */
2440 } 2641 }
2441 if (screen.tlen[row] >= 0) 2642 if (row_buf[row].l >= 0)
2442 if (write (fd, r1, 1) <= 0) 2643 if (write (fd, r1, 1) <= 0)
2443 return; /* XXX: death, no report */ 2644 return; /* XXX: death, no report */
2444 } 2645 }
2445} 2646}
2446#endif 2647#endif
2447 2648
2448/* ------------------------------------------------------------------------- * 2649/* ------------------------------------------------------------------------- *
2449 * CHARACTER SELECTION * 2650 * CHARACTER SELECTION *
2450 * ------------------------------------------------------------------------- */ 2651 * ------------------------------------------------------------------------- */
2451
2452/*
2453 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2454 */
2455void 2652void
2456rxvt_term::selection_check (int check_more) 2653rxvt_term::selection_check (int check_more) NOTHROW
2457{ 2654{
2458 row_col_t pos; 2655 row_col_t pos;
2459 2656
2460 if (!selection.op) 2657 if (!selection.op)
2461 return; 2658 return;
2462 2659
2463 pos.row = pos.col = 0; 2660 pos.row = pos.col = 0;
2464 if ((selection.beg.row < - (int32_t)TermWin.nscrolled) 2661 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2465 || (selection.beg.row >= TermWin.nrow) 2662 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2466 || (selection.mark.row < - (int32_t)TermWin.nscrolled) 2663 || !IN_RANGE_EXC (selection.end.row, top_row, nrow)
2467 || (selection.mark.row >= TermWin.nrow)
2468 || (selection.end.row < - (int32_t)TermWin.nscrolled)
2469 || (selection.end.row >= TermWin.nrow)
2470 || (check_more == 1 2664 || (check_more == 1
2471 && current_screen == selection.screen 2665 && current_screen == selection.screen
2472 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2666 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2473 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2667 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2474 || (check_more == 2 2668 || (check_more == 2
… …
2476 && ROWCOL_IS_AFTER (selection.end, pos)) 2670 && ROWCOL_IS_AFTER (selection.end, pos))
2477 || (check_more == 3 2671 || (check_more == 3
2478 && ROWCOL_IS_AFTER (selection.end, pos)) 2672 && ROWCOL_IS_AFTER (selection.end, pos))
2479 || (check_more == 4 /* screen width change */ 2673 || (check_more == 4 /* screen width change */
2480 && (selection.beg.row != selection.end.row 2674 && (selection.beg.row != selection.end.row
2481 || selection.end.col > TermWin.ncol))) 2675 || selection.end.col > ncol)))
2482 CLEAR_SELECTION (); 2676 CLEAR_SELECTION ();
2483} 2677}
2484 2678
2485/* ------------------------------------------------------------------------- */ 2679/* ------------------------------------------------------------------------- */
2486/* 2680/*
2487 * Paste a selection direct to the command fd 2681 * Paste a selection direct to the command fd
2488 */ 2682 */
2489void 2683void
2490rxvt_term::paste (const unsigned char *data, unsigned int len) 2684rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2491{ 2685{
2492 unsigned int i, j, n;
2493 unsigned char *ds = (unsigned char *)rxvt_malloc (PROP_SIZE);
2494
2495#if 0
2496 /* a paste should act like the user is typing, so check scrollTtyKeypress */
2497 ZERO_SCROLLBACK (r);
2498#endif
2499
2500 /* convert normal newline chars into common keyboard Return key sequence */ 2686 /* convert normal newline chars into common keyboard Return key sequence */
2501 for (i = 0; i < len; i += PROP_SIZE) 2687 for (unsigned int i = 0; i < len; i++)
2502 { 2688 if (data[i] == C0_LF)
2503 n = min (len - i, PROP_SIZE); 2689 data[i] = C0_CR;
2504 MEMCPY (ds, data + i, n);
2505 2690
2506 for (j = 0; j < n; j++) 2691 if (priv_modes & PrivMode_BracketPaste)
2507 if (ds[j] == '\n') 2692 tt_printf ("\e[200~");
2508 ds[j] = '\r';
2509 2693
2510 tt_write (ds, (int)n); 2694 tt_write (data, len);
2511 }
2512 2695
2513 free (ds); 2696 if (priv_modes & PrivMode_BracketPaste)
2697 tt_printf ("\e[201~");
2698}
2699
2700void
2701rxvt_term::paste (char *data, unsigned int len) NOTHROW
2702{
2703 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2704 return;
2705
2706 tt_paste (data, len);
2514} 2707}
2515 2708
2516/* ------------------------------------------------------------------------- */ 2709/* ------------------------------------------------------------------------- */
2517/* 2710/*
2518 * Respond to a notification that a primary selection has been sent 2711 * Respond to a notification that a primary selection has been sent
2519 * EXT: SelectionNotify 2712 * EXT: SelectionNotify
2520 */ 2713 */
2521int 2714void
2522rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) 2715rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW
2523{ 2716{
2524 long nread = 0;
2525 unsigned long bytes_after;
2526 XTextProperty ct;
2527
2528 D_SELECT ((stderr, "rxvt_selection_paste (%08lx, %lu, %d), wait=%2x", win, (unsigned long)prop, (int)delete_prop, selection_wait));
2529
2530 if (prop == None) /* check for failed XConvertSelection */ 2717 if (prop == None) /* check for failed XConvertSelection */
2531 { 2718 {
2532 if ((selection_type & Sel_CompoundText)) 2719 if ((selection_type & Sel_CompoundText))
2533 { 2720 {
2534 int selnum = selection_type & Sel_whereMask; 2721 int selnum = selection_type & Sel_whereMask;
… …
2547 selection_request_other (xa[XA_COMPOUND_TEXT], selnum); 2734 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2548 else 2735 else
2549 selection_type = 0; 2736 selection_type = 0;
2550 } 2737 }
2551 2738
2552 return 0; 2739 return;
2553 }
2554
2555 for (;;)
2556 { 2740 }
2557 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4), 2741
2558 (long) (PROP_SIZE / 4), delete_prop, 2742 unsigned long bytes_after;
2743 XTextProperty ct;
2744
2745 if (XGetWindowProperty (dpy, win, prop,
2746 0, PROP_SIZE / 4,
2747 delete_prop, AnyPropertyType,
2748 &ct.encoding, &ct.format,
2749 &ct.nitems, &bytes_after,
2750 &ct.value) != Success)
2751 {
2752 ct.value = 0;
2753 goto bailout;
2754 }
2755
2756 if (ct.encoding == None)
2757 goto bailout;
2758
2759 if (bytes_after)
2760 {
2761 // fetch and append remaining data
2762 XTextProperty ct2;
2763
2764 if (XGetWindowProperty (dpy, win, prop,
2765 ct.nitems / 4, (bytes_after + 3) / 4,
2766 delete_prop, AnyPropertyType,
2559 AnyPropertyType, &ct.encoding, &ct.format, 2767 &ct2.encoding, &ct2.format,
2560 &ct.nitems, &bytes_after, 2768 &ct2.nitems, &bytes_after,
2561 &ct.value) != Success) 2769 &ct2.value) != Success)
2562 break; 2770 goto bailout;
2563 2771
2564 if (ct.encoding == 0) 2772 // realloc should be compatible to XFree, here, and elsewhere, too
2565 { 2773 ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1);
2566 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!")); 2774 memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1);
2567 break; 2775 ct.nitems += ct2.nitems;
2568 }
2569 2776
2777 XFree (ct2.value);
2778 }
2779
2570 if (ct.value == NULL) 2780 if (ct.value == 0)
2571 { 2781 goto bailout;
2572 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2573 continue;
2574 }
2575 2782
2783 if (ct.encoding == xa[XA_INCR])
2784 {
2785 // INCR selection, start handshake
2786 if (!delete_prop)
2787 XDeleteProperty (dpy, win, prop);
2788
2789 selection_wait = Sel_incr;
2790 incr_buf_fill = 0;
2791 incr_ev.start (10);
2792
2793 goto bailout;
2794 }
2795
2576 if (ct.nitems == 0) 2796 if (ct.nitems == 0)
2797 {
2798 if (selection_wait == Sel_incr)
2799 {
2800 XFree (ct.value);
2801
2802 // finally complete, now paste the whole thing
2803 selection_wait = Sel_normal;
2804 ct.value = (unsigned char *)incr_buf;
2805 ct.nitems = incr_buf_fill;
2806 incr_buf = 0;
2807 incr_buf_size = 0;
2808 incr_ev.stop ();
2577 { 2809 }
2578 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end")); 2810 else
2579 2811 {
2580 if (selection_wait == Sel_normal && nread == 0 2812 if (selection_wait == Sel_normal
2581 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion 2813 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2582 { 2814 {
2583 /* 2815 /*
2584 * pass through again trying CUT_BUFFER0 if we've come from 2816 * pass through again trying CUT_BUFFER0 if we've come from
2585 * XConvertSelection () but nothing was presented 2817 * XConvertSelection () but nothing was presented
2586 */ 2818 */
2587 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2588 selection_paste (display->root, XA_CUT_BUFFER0, False); 2819 selection_paste (display->root, XA_CUT_BUFFER0, False);
2589 } 2820 }
2590 2821
2591 nread = -1; /* discount any previous stuff */ 2822 goto bailout;
2592 break;
2593 }
2594
2595 nread += ct.nitems;
2596
2597 char **cl;
2598 int cr;
2599 if (XmbTextPropertyToTextList (display->display, &ct, &cl,
2600 &cr) >= 0 && cl)
2601 { 2823 }
2824 }
2825 else if (selection_wait == Sel_incr)
2826 {
2827 incr_ev.start (10);
2828
2829 while (incr_buf_fill + ct.nitems > incr_buf_size)
2830 {
2831 incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024;
2832 incr_buf = (char *)realloc (incr_buf, incr_buf_size);
2833 }
2834
2835 memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems);
2836 incr_buf_fill += ct.nitems;
2837
2838 goto bailout;
2839 }
2840
2841 char **cl;
2842 int cr;
2843
2844#if !ENABLE_MINIMAL
2845 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
2846 // so recode it manually
2847 if (ct.encoding == xa[XA_UTF8_STRING])
2848 {
2849 wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems);
2850 char *s = rxvt_wcstombs (w);
2851 free (w);
2852 // TODO: strlen == only the first element will be converted. well...
2853 paste (s, strlen (s));
2854 free (s);
2855 }
2856 else
2857#endif
2858 if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0
2859 && cl)
2860 {
2602 for (int i = 0; i < cr; i++) 2861 for (int i = 0; i < cr; i++)
2603 paste ((unsigned char *)cl[i], STRLEN (cl[i])); 2862 paste (cl[i], strlen (cl[i]));
2604 2863
2605 XFreeStringList (cl); 2864 XFreeStringList (cl);
2606 } 2865 }
2607 else 2866 else
2608 paste (ct.value, ct.nitems); 2867 paste ((char *)ct.value, ct.nitems); // paste raw
2609 2868
2610 if (bytes_after == 0) 2869bailout:
2611 break;
2612
2613 XFree (ct.value);
2614 }
2615
2616 if (ct.value)
2617 XFree (ct.value); 2870 XFree (ct.value);
2618 2871
2619 if (selection_wait == Sel_normal) 2872 if (selection_wait == Sel_normal)
2620 selection_wait = Sel_none; 2873 selection_wait = Sel_none;
2621
2622 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2623 return (int)nread;
2624} 2874}
2625 2875
2626void 2876void
2627rxvt_term::incr_cb (time_watcher &w) 2877rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
2628{ 2878{
2629 selection_wait = Sel_none; 2879 selection_wait = Sel_none;
2630 2880
2881 incr_buf_size = 0;
2882 free (incr_buf);
2883
2631 rxvt_print_error ("data loss: timeout on INCR selection paste"); 2884 rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n");
2632} 2885}
2633 2886
2634/*
2635 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2636 */
2637void 2887void
2638rxvt_term::selection_property (Window win, Atom prop) 2888rxvt_term::selection_property (Window win, Atom prop) NOTHROW
2639{ 2889{
2640 int reget_time = 0; 2890 if (prop == None || selection_wait != Sel_incr)
2641
2642 if (prop == None)
2643 return; 2891 return;
2644 2892
2645 D_SELECT ((stderr, "rxvt_selection_property (%08lx, %lu)", win, (unsigned long)prop));
2646 if (selection_wait == Sel_normal)
2647 {
2648 int a, afmt;
2649 Atom atype;
2650 unsigned long bytes_after, nitems;
2651 unsigned char *s = NULL;
2652
2653 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False,
2654 xa[XA_INCR], &atype, &afmt, &nitems,
2655 &bytes_after, &s);
2656 if (s)
2657 XFree (s);
2658 if (a != Success)
2659 return;
2660
2661#ifndef __CYGWIN32__
2662 if (atype == xa[XA_INCR])
2663 { /* start an INCR transfer */
2664 D_SELECT ((stderr, "rxvt_selection_property: INCR: starting transfer"));
2665 XDeleteProperty (display->display, win, prop);
2666 XFlush (display->display);
2667 reget_time = 1;
2668 selection_wait = Sel_incr;
2669 }
2670#endif
2671
2672 }
2673 else if (selection_wait == Sel_incr)
2674 {
2675 reget_time = 1;
2676
2677 if (selection_paste (win, prop, True) == -1) 2893 selection_paste (win, prop, true);
2678 {
2679 D_SELECT ((stderr, "rxvt_selection_property: INCR: clean end"));
2680 selection_wait = Sel_none;
2681 incr_ev.stop ();
2682 }
2683 }
2684 if (reget_time) /* received more data so reget time */
2685 incr_ev.start (NOW + 10);
2686} 2894}
2687 2895
2688/* ------------------------------------------------------------------------- */ 2896/* ------------------------------------------------------------------------- */
2689/* 2897/*
2690 * Request the current selection: 2898 * Request the current selection:
2691 * Order: > internal selection if available 2899 * Order: > internal selection if available
2692 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2900 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2693 * > CUT_BUFFER0 2901 * > CUT_BUFFER0
2694 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2902 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2695 * will auto fallback to CUT_BUFFER0 2903 * will auto fallback to CUT_BUFFER0
2696 * EXT: button 2 release 2904 * EXT: button 2 release
2697 */ 2905 */
2698void 2906void
2699rxvt_term::selection_request (Time tm, int x, int y) 2907rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2700{ 2908{
2701 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y)); 2909 if (selection.text && selnum == Sel_Primary)
2702 2910 {
2703 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height)
2704 return; /* outside window */
2705
2706 if (selection.text)
2707 { /* internal selection */ 2911 /* internal selection */
2708 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2709 char *str = rxvt_wcstombs (selection.text, selection.len); 2912 char *str = rxvt_wcstombs (selection.text, selection.len);
2710 paste ((unsigned char *)str, strlen (str)); 2913 paste (str, strlen (str));
2711 free (str); 2914 free (str);
2712 return; 2915 return;
2713 } 2916 }
2714 else 2917 else
2715 { 2918 {
2716 int i;
2717
2718 selection_request_time = tm; 2919 selection_request_time = tm;
2719 selection_wait = Sel_normal; 2920 selection_wait = Sel_normal;
2720 for (i = Sel_Primary; i <= Sel_Clipboard; i++) 2921
2721 {
2722#if X_HAVE_UTF8_STRING 2922#if X_HAVE_UTF8_STRING
2723 selection_type = Sel_UTF8String; 2923 selection_type = Sel_UTF8String;
2724 if (selection_request_other (xa[XA_UTF8_STRING], i)) 2924 if (selection_request_other (xa[XA_UTF8_STRING], selnum))
2725 return; 2925 return;
2726#else 2926#else
2727 selection_type = Sel_CompoundText; 2927 selection_type = Sel_CompoundText;
2728 if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) 2928 if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum))
2729 return; 2929 return;
2730#endif 2930#endif
2731
2732 }
2733 } 2931 }
2734 2932
2735 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2933 selection_wait = Sel_none; /* don't loop in selection_paste () */
2736 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2737 selection_paste (display->root, XA_CUT_BUFFER0, False); 2934 selection_paste (display->root, XA_CUT_BUFFER0, false);
2738} 2935}
2739 2936
2740int 2937int
2741rxvt_term::selection_request_other (Atom target, int selnum) 2938rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW
2742{ 2939{
2743 Atom sel; 2940 Atom sel;
2744#ifdef DEBUG_SELECT
2745 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2746#endif
2747 2941
2748 selection_type |= selnum; 2942 selection_type |= selnum;
2749 2943
2750 if (selnum == Sel_Primary) 2944 if (selnum == Sel_Primary)
2751 sel = XA_PRIMARY; 2945 sel = XA_PRIMARY;
2752 else if (selnum == Sel_Secondary) 2946 else if (selnum == Sel_Secondary)
2753 sel = XA_SECONDARY; 2947 sel = XA_SECONDARY;
2754 else 2948 else
2755 sel = xa[XA_CLIPBOARD]; 2949 sel = xa[XA_CLIPBOARD];
2756 2950
2757 if (XGetSelectionOwner (display->display, sel) != None) 2951 if (XGetSelectionOwner (dpy, sel) != None)
2758 { 2952 {
2759 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2760 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], 2953 XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION],
2761 TermWin.vt, selection_request_time); 2954 vt, selection_request_time);
2762 return 1; 2955 return 1;
2763 } 2956 }
2764 2957
2765 return 0; 2958 return 0;
2766} 2959}
… …
2769/* 2962/*
2770 * Clear all selected text 2963 * Clear all selected text
2771 * EXT: SelectionClear 2964 * EXT: SelectionClear
2772 */ 2965 */
2773void 2966void
2774rxvt_term::selection_clear () 2967rxvt_term::selection_clear (bool clipboard) NOTHROW
2775{ 2968{
2776 D_SELECT ((stderr, "rxvt_selection_clear ()")); 2969 if (!clipboard)
2777 2970 {
2778 want_refresh = 1; 2971 want_refresh = 1;
2779 free (selection.text); 2972 free (selection.text);
2780 selection.text = NULL; 2973 selection.text = NULL;
2781 selection.len = 0; 2974 selection.len = 0;
2782 CLEAR_SELECTION (); 2975 CLEAR_SELECTION ();
2976
2977 if (display->selection_owner == this)
2978 display->selection_owner = 0;
2979 }
2980 else
2981 {
2982 free (selection.clip_text);
2983 selection.clip_text = NULL;
2984 selection.clip_len = 0;
2985
2986 if (display->clipboard_owner == this)
2987 display->clipboard_owner = 0;
2988 }
2783} 2989}
2784 2990
2785/* ------------------------------------------------------------------------- */ 2991/* ------------------------------------------------------------------------- */
2786/* 2992/*
2787 * Copy a selection into the cut buffer 2993 * Copy a selection into the cut buffer
2788 * EXT: button 1 or 3 release 2994 * EXT: button 1 or 3 release
2789 */ 2995 */
2790void 2996void
2791rxvt_term::selection_make (Time tm) 2997rxvt_term::selection_make (Time tm)
2792{ 2998{
2793 int i, col, end_col, row, end_row; 2999 int i;
2794 wchar_t *new_selection_text; 3000 wchar_t *new_selection_text;
2795 text_t *t; 3001 text_t *t;
2796 3002
2797 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2798 switch (selection.op) 3003 switch (selection.op)
2799 { 3004 {
2800 case SELECTION_CONT: 3005 case SELECTION_CONT:
2801 break; 3006 break;
2802 case SELECTION_INIT: 3007 case SELECTION_INIT:
… …
2812 selection.op = SELECTION_DONE; 3017 selection.op = SELECTION_DONE;
2813 3018
2814 if (selection.clicks == 4) 3019 if (selection.clicks == 4)
2815 return; /* nothing selected, go away */ 3020 return; /* nothing selected, go away */
2816 3021
3022 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
3023 return;
3024
2817 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1); 3025 i = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2818 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); 3026 new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t));
2819 3027
2820 col = selection.beg.col;
2821 MAX_IT (col, 0);
2822 row = selection.beg.row + TermWin.saveLines;
2823 end_row = selection.end.row + TermWin.saveLines;
2824 int ofs = 0; 3028 int ofs = 0;
2825 int extra = 0; 3029 int extra = 0;
2826 3030
3031 int col = selection.beg.col;
3032 int row = selection.beg.row;
3033
3034 int end_col;
3035
2827 for (; row <= end_row; row++, col = 0) 3036 for (; row <= selection.end.row; row++, col = 0)
2828 { 3037 {
2829 t = &(screen.text[row][col]); 3038#if !ENABLE_MINIMAL
2830 3039 if (selection.rect)
2831 end_col = screen.tlen[row]; 3040 {
2832 3041 col = selection.beg.col;
2833 if (end_col == -1)
2834 end_col = TermWin.ncol; 3042 end_col = ncol + 1;
3043 }
3044 else
3045#endif
3046 end_col = ROW(row).l;
2835 3047
3048 col = max (col, 0);
3049
2836 if (row == end_row) 3050 if (row == selection.end.row
3051#if !ENABLE_MINIMAL
3052 || selection.rect
3053#endif
3054 )
2837 MIN_IT (end_col, selection.end.col); 3055 min_it (end_col, selection.end.col);
3056
3057 t = ROW(row).t + col;
2838 3058
2839 for (; col < end_col; col++) 3059 for (; col < end_col; col++)
2840 { 3060 {
2841 if (*t == NOCHAR) 3061 if (*t == NOCHAR)
2842 t++; 3062 t++;
3063#if ENABLE_COMBINING
2843 else if (IS_COMPOSE (*t)) 3064 else if (IS_COMPOSE (*t))
2844 { 3065 {
2845 int len = rxvt_composite.expand (*t, 0); 3066 int len = rxvt_composite.expand (*t, 0);
2846 3067
2847 extra -= (len - 1); 3068 extra -= (len - 1);
… …
2853 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); 3074 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t));
2854 } 3075 }
2855 3076
2856 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); 3077 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2857 } 3078 }
3079#endif
2858 else 3080 else
2859 new_selection_text[ofs++] = *t++; 3081 new_selection_text[ofs++] = *t++;
2860 } 3082 }
2861 3083
2862 if (screen.tlen[row] != -1 && row != end_row) 3084#if !ENABLE_MINIMAL
3085 if (selection.rect)
3086 {
3087 while (ofs
3088 && new_selection_text[ofs - 1] != C0_LF
3089 && unicode::is_space (new_selection_text[ofs - 1]))
3090 --ofs;
3091
2863 new_selection_text[ofs++] = L'\n'; 3092 new_selection_text[ofs++] = C0_LF;
2864 } 3093 }
2865 3094 else
2866#ifndef NO_OLD_SELECTION 3095#endif
2867 if (selection_style == OLD_SELECT) 3096 if (!ROW(row).is_longer () && row != selection.end.row)
2868 if (end_col == TermWin.ncol)
2869 new_selection_text[ofs++] = L'\n'; 3097 new_selection_text[ofs++] = C0_LF;
2870#endif 3098 }
2871#ifndef NO_NEW_SELECTION 3099
2872 if (selection_style != OLD_SELECT)
2873 if (end_col != selection.end.col) 3100 if (end_col != selection.end.col)
2874 new_selection_text[ofs++] = L'\n'; 3101 new_selection_text[ofs++] = C0_LF;
2875#endif 3102
2876 new_selection_text[ofs] = 0; 3103 new_selection_text[ofs] = 0;
2877 3104
2878 if (ofs == 0) 3105 if (ofs == 0)
2879 { 3106 {
2880 free (new_selection_text); 3107 free (new_selection_text);
… …
2885 3112
2886 // we usually allocate much more than necessary, so realloc it smaller again 3113 // we usually allocate much more than necessary, so realloc it smaller again
2887 selection.len = ofs; 3114 selection.len = ofs;
2888 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t)); 3115 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2889 3116
2890 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 3117 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2891 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 3118 return;
2892 display->set_selection_owner (this); 3119
3120 selection_grab (tm);
3121}
3122
3123bool
3124rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
3125{
3126 Atom sel;
3127
3128 if (!clipboard)
3129 {
3130 selection_time = tm;
3131 sel = XA_PRIMARY;
3132 }
2893 else 3133 else
2894 rxvt_print_error ("can't get primary selection"); 3134 {
3135 clipboard_time = tm;
3136 sel = xa[XA_CLIPBOARD];
3137 }
3138
3139 XSetSelectionOwner (dpy, sel, vt, tm);
3140 if (XGetSelectionOwner (dpy, sel) == vt)
3141 {
3142 display->set_selection_owner (this, clipboard);
3143 return true;
3144 }
3145 else
3146 {
3147 selection_clear (clipboard);
3148 return false;
3149 }
2895 3150
2896#if 0 3151#if 0
2897 XTextProperty ct; 3152 XTextProperty ct;
2898 3153
2899 if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) 3154 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
2900 { 3155 {
2901 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 3156 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2902 PropModeReplace, ct.value, ct.nitems);
2903 XFree (ct.value); 3157 XFree (ct.value);
2904 } 3158 }
2905#endif 3159#endif
2906
2907 selection_time = tm;
2908 D_SELECT ((stderr, "rxvt_selection_make (): selection.len=%d", selection.len));
2909} 3160}
2910 3161
2911/* ------------------------------------------------------------------------- */ 3162/* ------------------------------------------------------------------------- */
2912/* 3163/*
2913 * Mark or select text based upon number of clicks: 1, 2, or 3 3164 * Mark or select text based upon number of clicks: 1, 2, or 3
2914 * EXT: button 1 press 3165 * EXT: button 1 press
2915 */ 3166 */
2916void 3167void
2917rxvt_term::selection_click (int clicks, int x, int y) 3168rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2918{ 3169{
2919 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2920
2921 clicks = ((clicks - 1) % 3) + 1; 3170 clicks = ((clicks - 1) % 3) + 1;
2922 selection.clicks = clicks; /* save clicks so extend will work */ 3171 selection.clicks = clicks; /* save clicks so extend will work */
2923 3172
3173 if (clicks == 2 && !selection.rect
3174 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
3175 {
3176 MEvent.clicks = 1; // what a mess
3177 selection.screen = current_screen;
3178 selection.op = SELECTION_CONT;
3179 return;
3180 }
3181
2924 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 3182 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2925 3183
2926 if (clicks == 2 || clicks == 3) 3184 if (clicks == 2 || clicks == 3)
2927 selection_extend_colrow (selection.mark.col, 3185 selection_extend_colrow (selection.mark.col,
2928 selection.mark.row + TermWin.view_start, 3186 selection.mark.row - view_start,
2929 0, /* button 3 */ 3187 0, /* button 3 */
2930 1, /* button press */ 3188 1, /* button press */
2931 0); /* click change */ 3189 0); /* click change */
2932} 3190}
2933 3191
2934/* ------------------------------------------------------------------------- */ 3192/* ------------------------------------------------------------------------- */
2935/* 3193/*
2936 * Mark a selection at the specified col/row 3194 * Mark a selection at the specified col/row
2937 */ 3195 */
2938void 3196void
2939rxvt_term::selection_start_colrow (int col, int row) 3197rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2940{ 3198{
2941 want_refresh = 1; 3199 want_refresh = 1;
3200
3201 selection.mark.row = row + view_start;
2942 selection.mark.col = col; 3202 selection.mark.col = col;
2943 selection.mark.row = row - TermWin.view_start; 3203
2944 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 3204 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
2945 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 3205 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3206
2946 MAX_IT (selection.mark.col, 0); 3207 while (selection.mark.col > 0
2947 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); 3208 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3209 --selection.mark.col;
2948 3210
2949 if (selection.op) 3211 if (selection.op)
3212 {
2950 { /* clear the old selection */ 3213 /* clear the old selection */
2951 selection.beg.row = selection.end.row = selection.mark.row; 3214 selection.beg.row = selection.end.row = selection.mark.row;
2952 selection.beg.col = selection.end.col = selection.mark.col; 3215 selection.beg.col = selection.end.col = selection.mark.col;
2953 } 3216 }
3217
2954 selection.op = SELECTION_INIT; 3218 selection.op = SELECTION_INIT;
2955 selection.screen = current_screen; 3219 selection.screen = current_screen;
2956} 3220}
2957 3221
2958/* ------------------------------------------------------------------------- */ 3222/* ------------------------------------------------------------------------- */
… …
2960 * Word select: select text for 2 clicks 3224 * Word select: select text for 2 clicks
2961 * We now only find out the boundary in one direction 3225 * We now only find out the boundary in one direction
2962 */ 3226 */
2963 3227
2964/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3228/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2965#define DELIMIT_TEXT(x) \ 3229#define DELIMIT_TEXT(x) \
2966 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) 3230 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2967#define DELIMIT_REND(x) 1 3231#define DELIMIT_REND(x) 1
2968 3232
2969void 3233void
2970rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3234rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
2971{ 3235{
2972 int col, row, dirnadd, tcol, trow, w1, w2; 3236 int col, row, dirnadd, tcol, trow, w1, w2;
2973 row_col_t bound; 3237 row_col_t bound;
2974 text_t *stp; 3238 text_t *stp;
2975 rend_t *srp; 3239 rend_t *srp;
2976 3240
2977 if (dirn == UP) 3241 if (dirn == UP)
2978 { 3242 {
2979 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3243 bound.row = top_row - 1;
2980 bound.col = 0; 3244 bound.col = 0;
2981 dirnadd = -1; 3245 dirnadd = -1;
2982 } 3246 }
2983 else 3247 else
2984 { 3248 {
2985 bound.row = TermWin.saveLines + TermWin.nrow; 3249 bound.row = nrow;
2986 bound.col = TermWin.ncol - 1; 3250 bound.col = ncol - 1;
2987 dirnadd = 1; 3251 dirnadd = 1;
2988 } 3252 }
2989 row = mark->row + TermWin.saveLines; 3253
3254 row = mark->row;
2990 col = mark->col; 3255 col = max (mark->col, 0);
2991 MAX_IT (col, 0); 3256
2992 /* find the edge of a word */ 3257 /* find the edge of a word */
2993 stp = & (screen.text[row][col]); 3258 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
2994 w1 = DELIMIT_TEXT (*stp); 3259 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
2995 3260
2996 if (selection_style != NEW_SELECT) 3261 for (;;)
2997 { 3262 {
2998 if (w1 == 1) 3263 for (; col != bound.col; col += dirnadd)
2999 { 3264 {
3000 stp += dirnadd; 3265 stp += dirnadd;
3001 if (DELIMIT_TEXT (*stp) == 1)
3002 goto Old_Word_Selection_You_Die;
3003 col += dirnadd;
3004 }
3005 w1 = 0;
3006 }
3007 srp = (&screen.rend[row][col]);
3008 w2 = DELIMIT_REND (*srp);
3009
3010 for (;;)
3011 {
3012 for (; col != bound.col; col += dirnadd)
3013 {
3014 stp += dirnadd; 3266 srp += dirnadd;
3267
3268 if (*stp == NOCHAR)
3269 continue;
3270
3015 if (DELIMIT_TEXT (*stp) != w1) 3271 if (DELIMIT_TEXT (*stp) != w1)
3016 break; 3272 break;
3017 srp += dirnadd;
3018 if (DELIMIT_REND (*srp) != w2) 3273 if (DELIMIT_REND (*srp) != w2)
3019 break; 3274 break;
3020 } 3275 }
3276
3021 if ((col == bound.col) && (row != bound.row)) 3277 if ((col == bound.col) && (row != bound.row))
3022 { 3278 {
3023 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3279 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
3024 { 3280 {
3025 trow = row + dirnadd; 3281 trow = row + dirnadd;
3026 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3282 tcol = dirn == UP ? ncol - 1 : 0;
3027 if (screen.text[trow] == NULL) 3283
3284 if (!ROW(trow).t)
3028 break; 3285 break;
3029 stp = & (screen.text[trow][tcol]); 3286
3030 srp = & (screen.rend[trow][tcol]); 3287 stp = ROW(trow).t + tcol;
3288 srp = ROW(trow).r + tcol;
3289
3031 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3290 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
3032 break; 3291 break;
3292
3033 row = trow; 3293 row = trow;
3034 col = tcol; 3294 col = tcol;
3035 continue; 3295 continue;
3036 } 3296 }
3037 } 3297 }
3038 break; 3298 break;
3039 } 3299 }
3040Old_Word_Selection_You_Die:
3041 D_SELECT ((stderr, "rxvt_selection_delimit_word (%s,...) @ (r:%3d, c:%3d) has boundary (r:%3d, c:%3d)", (dirn == UP ? "up " : "down"), mark->row, mark->col, row - TermWin.saveLines, col));
3042 3300
3043 if (dirn == DN) 3301 if (dirn == DN)
3044 col++; /* put us on one past the end */ 3302 col++; /* put us on one past the end */
3045 3303
3046 /* Poke the values back in */ 3304 /* Poke the values back in */
3047 ret->row = row - TermWin.saveLines; 3305 ret->row = row;
3048 ret->col = col; 3306 ret->col = col;
3049} 3307}
3050 3308
3051/* ------------------------------------------------------------------------- */ 3309/* ------------------------------------------------------------------------- */
3052/* 3310/*
… …
3055 * flag == 0 ==> button 1 3313 * flag == 0 ==> button 1
3056 * flag == 1 ==> button 3 press 3314 * flag == 1 ==> button 3 press
3057 * flag == 2 ==> button 3 motion 3315 * flag == 2 ==> button 3 motion
3058 */ 3316 */
3059void 3317void
3060rxvt_term::selection_extend (int x, int y, int flag) 3318rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3061{ 3319{
3062 int col, row; 3320 int col = clamp (Pixel2Col (x), 0, ncol);
3321 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3063 3322
3064 col = Pixel2Col (x);
3065 row = Pixel2Row (y);
3066 MAX_IT (row, 0);
3067 MIN_IT (row, (int)TermWin.nrow - 1);
3068 MAX_IT (col, 0);
3069 MIN_IT (col, (int)TermWin.ncol);
3070
3071#ifndef NO_NEW_SELECTION
3072 /* 3323 /*
3073 * If we're selecting characters (single click) then we must check first 3324 * If we're selecting characters (single click) then we must check first
3074 * if we are at the same place as the original mark. If we are then 3325 * if we are at the same place as the original mark. If we are then
3075 * select nothing. Otherwise, if we're to the right of the mark, you have to 3326 * select nothing. Otherwise, if we're to the right of the mark, you have to
3076 * be _past_ a character for it to be selected. 3327 * be _past_ a character for it to be selected.
3077 */ 3328 */
3078 if (selection_style != OLD_SELECT)
3079 {
3080 if (((selection.clicks % 3) == 1) && !flag 3329 if (((selection.clicks % 3) == 1) && !flag
3081 && (col == selection.mark.col 3330 && (col == selection.mark.col
3082 && (row == selection.mark.row + TermWin.view_start))) 3331 && (row == selection.mark.row - view_start)))
3083 { 3332 {
3084 /* select nothing */ 3333 /* select nothing */
3085 selection.beg.row = selection.end.row = 0; 3334 selection.beg.row = selection.end.row = 0;
3086 selection.beg.col = selection.end.col = 0; 3335 selection.beg.col = selection.end.col = 0;
3087 selection.clicks = 4; 3336 selection.clicks = 4;
3088 want_refresh = 1; 3337 want_refresh = 1;
3089 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3090 return; 3338 return;
3091 }
3092 } 3339 }
3093#endif 3340
3094 if (selection.clicks == 4) 3341 if (selection.clicks == 4)
3095 selection.clicks = 1; 3342 selection.clicks = 1;
3096 3343
3097 selection_extend_colrow (col, row, !!flag, /* ? button 3 */ 3344 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
3098 flag == 1 ? 1 : 0, /* ? button press */ 3345 flag == 1 ? 1 : 0, /* ? button press */
… …
3102/* ------------------------------------------------------------------------- */ 3349/* ------------------------------------------------------------------------- */
3103/* 3350/*
3104 * Extend the selection to the specified col/row 3351 * Extend the selection to the specified col/row
3105 */ 3352 */
3106void 3353void
3107rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3354rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3108{ 3355{
3109 int16_t ncol = TermWin.ncol;
3110 int end_col;
3111 row_col_t pos; 3356 row_col_t pos;
3112 enum { 3357 enum {
3113 LEFT, RIGHT 3358 LEFT, RIGHT
3114 } closeto = RIGHT; 3359 } closeto = RIGHT;
3115 3360
3116 D_SELECT ((stderr, "rxvt_selection_extend_colrow (c:%d, r:%d, %d, %d) clicks:%d, op:%d", col, row, button3, buttonpress, selection.clicks, selection.op));
3117 D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3118
3119 want_refresh = 1; 3361 want_refresh = 1;
3362
3120 switch (selection.op) 3363 switch (selection.op)
3121 { 3364 {
3122 case SELECTION_INIT: 3365 case SELECTION_INIT:
3123 CLEAR_SELECTION (); 3366 CLEAR_SELECTION ();
3124 selection.op = SELECTION_BEGIN; 3367 selection.op = SELECTION_BEGIN;
… …
3137 selection_start_colrow (col, row); 3380 selection_start_colrow (col, row);
3138 /* FALLTHROUGH */ 3381 /* FALLTHROUGH */
3139 default: 3382 default:
3140 return; 3383 return;
3141 } 3384 }
3385
3142 if (selection.beg.col == selection.end.col 3386 if (selection.beg.col == selection.end.col
3143 && selection.beg.col != selection.mark.col 3387 && selection.beg.col != selection.mark.col
3144 && selection.beg.row == selection.end.row 3388 && selection.beg.row == selection.end.row
3145 && selection.beg.row != selection.mark.row) 3389 && selection.beg.row != selection.mark.row)
3146 { 3390 {
3147 selection.beg.col = selection.end.col = selection.mark.col; 3391 selection.beg.col = selection.end.col = selection.mark.col;
3148 selection.beg.row = selection.end.row = selection.mark.row; 3392 selection.beg.row = selection.end.row = selection.mark.row;
3149 D_SELECT ((stderr, "rxvt_selection_extend_colrow () ENT2 b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3150 } 3393 }
3151 3394
3152 pos.col = col; 3395 pos.col = col;
3153 pos.row = row; 3396 pos.row = view_start + row;
3154 3397
3155 pos.row -= TermWin.view_start; /* adjust for scroll */
3156
3157#ifndef NO_OLD_SELECTION
3158 /*
3159 * This mimics some of the selection behaviour of version 2.20 and before.
3160 * There are no ``selection modes'', button3 is always character extension.
3161 * Note: button3 drag is always available, c.f. v2.20
3162 * Selection always terminates (left or right as appropriate) at the mark.
3163 */
3164 if (selection_style == OLD_SELECT)
3165 {
3166 if (selection.clicks == 1 || button3)
3167 {
3168 if (hate_those_clicks)
3169 {
3170 hate_those_clicks = 0;
3171 if (selection.clicks == 1)
3172 {
3173 selection.beg.row = selection.mark.row;
3174 selection.beg.col = selection.mark.col;
3175 }
3176 else
3177 {
3178 selection.mark.row = selection.beg.row;
3179 selection.mark.col = selection.beg.col;
3180 }
3181 }
3182 if (ROWCOL_IS_BEFORE (pos, selection.mark))
3183 {
3184 selection.end.row = selection.mark.row;
3185 selection.end.col = selection.mark.col + 1;
3186 selection.beg.row = pos.row;
3187 selection.beg.col = pos.col;
3188 }
3189 else
3190 {
3191 selection.beg.row = selection.mark.row;
3192 selection.beg.col = selection.mark.col;
3193 selection.end.row = pos.row;
3194 selection.end.col = pos.col + 1;
3195 }
3196 }
3197 else if (selection.clicks == 2)
3198 {
3199 selection_delimit_word (UP, & (selection.mark),
3200 & (selection.beg));
3201 selection_delimit_word (DN, & (selection.mark),
3202 & (selection.end));
3203 hate_those_clicks = 1;
3204 }
3205 else if (selection.clicks == 3)
3206 {
3207 selection.beg.row = selection.end.row = selection.mark.row;
3208 selection.beg.col = 0;
3209 selection.end.col = ncol;
3210 hate_those_clicks = 1;
3211 }
3212 D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3213 return;
3214 }
3215#endif /* ! NO_OLD_SELECTION */
3216#ifndef NO_NEW_SELECTION
3217 /* selection_style must not be OLD_SELECT to get here */
3218 /* 3398 /*
3219 * This is mainly xterm style selection with a couple of differences, mainly 3399 * This is mainly xterm style selection with a couple of differences, mainly
3220 * in the way button3 drag extension works. 3400 * in the way button3 drag extension works.
3221 * We're either doing: button1 drag; button3 press; or button3 drag 3401 * We're either doing: button1 drag; button3 press; or button3 drag
3222 * a) button1 drag : select around a midpoint/word/line - that point/word/line 3402 * a) button1 drag : select around a midpoint/word/line - that point/word/line
… …
3227 * a point/word/line which is either the start or end of the selection 3407 * a point/word/line which is either the start or end of the selection
3228 * and it was decided by whichever point/word/line was `fixed' at the 3408 * and it was decided by whichever point/word/line was `fixed' at the
3229 * time of the most recent button3 press 3409 * time of the most recent button3 press
3230 */ 3410 */
3231 if (button3 && buttonpress) 3411 if (button3 && buttonpress)
3412 {
3232 { /* button3 press */ 3413 /* button3 press */
3233 /* 3414 /*
3234 * first determine which edge of the selection we are closest to 3415 * first determine which edge of the selection we are closest to
3235 */ 3416 */
3236 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3417 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3237 || (!ROWCOL_IS_AFTER (pos, selection.end) 3418 || (!ROWCOL_IS_AFTER (pos, selection.end)
3238 && (((pos.col - selection.beg.col) 3419 && (((pos.col - selection.beg.col)
3239 + ((pos.row - selection.beg.row) * ncol)) 3420 + ((pos.row - selection.beg.row) * ncol))
3240 < ((selection.end.col - pos.col) 3421 < ((selection.end.col - pos.col)
3241 + ((selection.end.row - pos.row) * ncol))))) 3422 + ((selection.end.row - pos.row) * ncol)))))
3242 closeto = LEFT; 3423 closeto = LEFT;
3424
3243 if (closeto == LEFT) 3425 if (closeto == LEFT)
3244 { 3426 {
3245 selection.beg.row = pos.row; 3427 selection.beg.row = pos.row;
3246 selection.beg.col = pos.col; 3428 selection.beg.col = pos.col;
3247 selection.mark.row = selection.end.row; 3429 selection.mark.row = selection.end.row;
3248 selection.mark.col = selection.end.col 3430 selection.mark.col = selection.end.col - (selection.clicks == 2);
3249 - (selection.clicks == 2);
3250 } 3431 }
3251 else 3432 else
3252 { 3433 {
3253 selection.end.row = pos.row; 3434 selection.end.row = pos.row;
3254 selection.end.col = pos.col; 3435 selection.end.col = pos.col;
3255 selection.mark.row = selection.beg.row; 3436 selection.mark.row = selection.beg.row;
3256 selection.mark.col = selection.beg.col; 3437 selection.mark.col = selection.beg.col;
3257 } 3438 }
3258 } 3439 }
3259 else 3440 else
3441 {
3260 { /* button1 drag or button3 drag */ 3442 /* button1 drag or button3 drag */
3261 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3443 if (ROWCOL_IS_AFTER (selection.mark, pos))
3262 { 3444 {
3263 if ((selection.mark.row == selection.end.row) 3445 if (selection.mark.row == selection.end.row
3264 && (selection.mark.col == selection.end.col) 3446 && selection.mark.col == selection.end.col
3447 && clickchange
3265 && clickchange && selection.clicks == 2) 3448 && selection.clicks == 2)
3266 selection.mark.col--; 3449 selection.mark.col--;
3450
3267 selection.beg.row = pos.row; 3451 selection.beg.row = pos.row;
3268 selection.beg.col = pos.col; 3452 selection.beg.col = pos.col;
3269 selection.end.row = selection.mark.row; 3453 selection.end.row = selection.mark.row;
3270 selection.end.col = selection.mark.col 3454 selection.end.col = selection.mark.col + (selection.clicks == 2);
3271 + (selection.clicks == 2);
3272 } 3455 }
3273 else 3456 else
3274 { 3457 {
3275 selection.beg.row = selection.mark.row; 3458 selection.beg.row = selection.mark.row;
3276 selection.beg.col = selection.mark.col; 3459 selection.beg.col = selection.mark.col;
… …
3279 } 3462 }
3280 } 3463 }
3281 3464
3282 if (selection.clicks == 1) 3465 if (selection.clicks == 1)
3283 { 3466 {
3284 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3467 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3285 if (end_col != -1 && selection.beg.col > end_col) 3468 && !ROW(selection.beg.row).is_longer ()
3469#if !ENABLE_MINIMAL
3470 && !selection.rect
3471#endif
3286 { 3472 )
3287#if 1
3288 selection.beg.col = ncol; 3473 selection.beg.col = ncol;
3289#else
3290 if (selection.beg.row != selection.end.row)
3291 selection.beg.col = ncol;
3292 else
3293 selection.beg.col = selection.mark.col;
3294#endif
3295 3474
3475 if (
3476 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3477 && !ROW(selection.end.row).is_longer ()
3478#if !ENABLE_MINIMAL
3479 && !selection.rect
3480#endif
3296 } 3481 )
3297 end_col = screen.tlen[selection.end.row + TermWin.saveLines];
3298 if (end_col != -1 && selection.end.col > end_col)
3299 selection.end.col = ncol; 3482 selection.end.col = ncol;
3300
3301 } 3483 }
3302 else if (selection.clicks == 2) 3484 else if (selection.clicks == 2)
3303 { 3485 {
3304 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3486 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3305 selection.end.col--; 3487 selection.end.col--;
3488
3306 selection_delimit_word (UP, & (selection.beg), 3489 selection_delimit_word (UP, &selection.beg, &selection.beg);
3307 & (selection.beg));
3308 selection_delimit_word (DN, & (selection.end), 3490 selection_delimit_word (DN, &selection.end, &selection.end);
3309 & (selection.end));
3310 } 3491 }
3311 else if (selection.clicks == 3) 3492 else if (selection.clicks == 3)
3312 { 3493 {
3313#ifndef NO_FRILLS 3494#if ENABLE_FRILLS
3314 if ((Options & Opt_tripleclickwords)) 3495 if (option (Opt_tripleclickwords))
3315 { 3496 {
3316 int end_row;
3317
3318 selection_delimit_word (UP, & (selection.beg), 3497 selection_delimit_word (UP, &selection.beg, &selection.beg);
3319 & (selection.beg)); 3498
3320 end_row = screen.tlen[selection.mark.row
3321 + TermWin.saveLines];
3322 for (end_row = selection.mark.row; end_row < TermWin.nrow; 3499 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3323 end_row++)
3324 { 3500 {
3325 end_col = screen.tlen[end_row + TermWin.saveLines]; 3501 if (!ROW(end_row).is_longer ())
3326 if (end_col != -1)
3327 { 3502 {
3328 selection.end.row = end_row; 3503 selection.end.row = end_row;
3329 selection.end.col = end_col; 3504 selection.end.col = ROW(end_row).l;
3505# if !ENABLE_MINIMAL
3330 selection_remove_trailing_spaces (); 3506 selection_remove_trailing_spaces ();
3507# endif
3331 break; 3508 break;
3332 } 3509 }
3333 } 3510 }
3334 } 3511 }
3335 else 3512 else
3336#endif 3513#endif
3337
3338 { 3514 {
3339 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3515 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3340 selection.mark.col++; 3516 selection.mark.col++;
3517
3341 selection.beg.col = 0; 3518 selection.beg.col = 0;
3342 selection.end.col = ncol; 3519 selection.end.col = ncol;
3520
3521 // select a complete logical line
3522 while (selection.beg.row > -saveLines
3523 && ROW(selection.beg.row - 1).is_longer ())
3524 selection.beg.row--;
3525
3526 while (selection.end.row < nrow
3527 && ROW(selection.end.row).is_longer ())
3528 selection.end.row++;
3343 } 3529 }
3344 } 3530 }
3531
3345 if (button3 && buttonpress) 3532 if (button3 && buttonpress)
3533 {
3346 { /* mark may need to be changed */ 3534 /* mark may need to be changed */
3347 if (closeto == LEFT) 3535 if (closeto == LEFT)
3348 { 3536 {
3349 selection.mark.row = selection.end.row; 3537 selection.mark.row = selection.end.row;
3350 selection.mark.col = selection.end.col 3538 selection.mark.col = selection.end.col - (selection.clicks == 2);
3351 - (selection.clicks == 2);
3352 } 3539 }
3353 else 3540 else
3354 { 3541 {
3355 selection.mark.row = selection.beg.row; 3542 selection.mark.row = selection.beg.row;
3356 selection.mark.col = selection.beg.col; 3543 selection.mark.col = selection.beg.col;
3357 } 3544 }
3358 } 3545 }
3359 D_SELECT ((stderr, "rxvt_selection_extend_colrow () EXIT b: (r:%d,c:%d) m: (r:%d,c:%d), e: (r:%d,c:%d)", selection.beg.row, selection.beg.col, selection.mark.row, selection.mark.col, selection.end.row, selection.end.col));
3360#endif /* ! NO_NEW_SELECTION */
3361}
3362 3546
3363#ifndef NO_FRILLS 3547#if !ENABLE_MINIMAL
3548 if (selection.rect && selection.beg.col > selection.end.col)
3549 ::swap (selection.beg.col, selection.end.col);
3550#endif
3551}
3552
3553#if !ENABLE_MINIMAL
3364void 3554void
3365rxvt_term::selection_remove_trailing_spaces () 3555rxvt_term::selection_remove_trailing_spaces () NOTHROW
3366{ 3556{
3367 int32_t end_col, end_row; 3557 int32_t end_col, end_row;
3368 text_t *stp; 3558 text_t *stp;
3369 3559
3370 end_col = selection.end.col; 3560 end_col = selection.end.col;
3371 end_row = selection.end.row; 3561 end_row = selection.end.row;
3562
3372 for ( ; end_row >= selection.beg.row; ) 3563 for (; end_row >= selection.beg.row; )
3373 { 3564 {
3374 stp = screen.text[end_row + TermWin.saveLines]; 3565 stp = ROW(end_row).t;
3566
3375 while (--end_col >= 0) 3567 while (--end_col >= 0)
3376 { 3568 {
3377 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3569 if (stp[end_col] != NOCHAR
3570 && !unicode::is_space (stp[end_col]))
3378 break; 3571 break;
3379 } 3572 }
3573
3380 if (end_col >= 0 3574 if (end_col >= 0
3381 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3575 || !ROW(end_row - 1).is_longer ())
3382 { 3576 {
3383 selection.end.col = end_col + 1; 3577 selection.end.col = end_col + 1;
3384 selection.end.row = end_row; 3578 selection.end.row = end_row;
3385 break; 3579 break;
3386 } 3580 }
3581
3387 end_row--; 3582 end_row--;
3388 end_col = TermWin.ncol; 3583 end_col = ncol;
3389 } 3584 }
3585
3390 if (selection.mark.row > selection.end.row) 3586 if (selection.mark.row > selection.end.row)
3391 { 3587 {
3392 selection.mark.row = selection.end.row; 3588 selection.mark.row = selection.end.row;
3393 selection.mark.col = selection.end.col; 3589 selection.mark.col = selection.end.col;
3394 } 3590 }
… …
3402/* 3598/*
3403 * Double click on button 3 when already selected 3599 * Double click on button 3 when already selected
3404 * EXT: button 3 double click 3600 * EXT: button 3 double click
3405 */ 3601 */
3406void 3602void
3407rxvt_term::selection_rotate (int x, int y) 3603rxvt_term::selection_rotate (int x, int y) NOTHROW
3408{ 3604{
3409 selection.clicks = selection.clicks % 3 + 1; 3605 selection.clicks = selection.clicks % 3 + 1;
3410 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3606 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3411} 3607}
3412 3608
3413/* ------------------------------------------------------------------------- */ 3609/* ------------------------------------------------------------------------- */
3414/* 3610/*
3415 * On some systems, the Atom typedef is 64 bits wide. We need to have a type
3416 * that is exactly 32 bits wide, because a format of 64 is not allowed by
3417 * the X11 protocol.
3418 */
3419typedef CARD32 Atom32;
3420
3421/* ------------------------------------------------------------------------- */
3422/*
3423 * Respond to a request for our current selection 3611 * Respond to a request for our current selection
3424 * EXT: SelectionRequest 3612 * EXT: SelectionRequest
3425 */ 3613 */
3426void 3614void
3427rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3615rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3428{ 3616{
3429 XSelectionEvent ev; 3617 XSelectionEvent ev;
3430 XTextProperty ct;
3431 XICCEncodingStyle style;
3432 Atom target;
3433 3618
3434 ev.type = SelectionNotify; 3619 ev.type = SelectionNotify;
3435 ev.property = None; 3620 ev.property = None;
3436 ev.display = rq.display; 3621 ev.display = rq.display;
3437 ev.requestor = rq.requestor; 3622 ev.requestor = rq.requestor;
… …
3439 ev.target = rq.target; 3624 ev.target = rq.target;
3440 ev.time = rq.time; 3625 ev.time = rq.time;
3441 3626
3442 if (rq.target == xa[XA_TARGETS]) 3627 if (rq.target == xa[XA_TARGETS])
3443 { 3628 {
3444 Atom32 target_list[6]; 3629 Atom target_list[6];
3445 Atom32 *target = target_list; 3630 Atom *target = target_list;
3446 3631
3447 *target++ = (Atom32) xa[XA_TARGETS]; 3632 *target++ = xa[XA_TARGETS];
3448 *target++ = (Atom32) xa[XA_TIMESTAMP]; 3633 *target++ = xa[XA_TIMESTAMP];
3449 *target++ = (Atom32) XA_STRING; 3634 *target++ = XA_STRING;
3450 *target++ = (Atom32) xa[XA_TEXT]; 3635 *target++ = xa[XA_TEXT];
3451 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3636 *target++ = xa[XA_COMPOUND_TEXT];
3452#if X_HAVE_UTF8_STRING 3637#if X_HAVE_UTF8_STRING
3453 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3638 *target++ = xa[XA_UTF8_STRING];
3454#endif 3639#endif
3455 3640
3456 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3641 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3457 (8 * sizeof (target_list[0])), PropModeReplace, 3642 32, PropModeReplace,
3458 (unsigned char *)target_list, 3643 (unsigned char *)target_list, target - target_list);
3459 target - target_list);
3460 ev.property = rq.property; 3644 ev.property = rq.property;
3461 } 3645 }
3646#if TODO // TODO
3462 else if (rq.target == xa[XA_MULTIPLE]) 3647 else if (rq.target == xa[XA_MULTIPLE])
3463 { 3648 {
3464 /* TODO: Handle MULTIPLE */ 3649 /* TODO: Handle MULTIPLE */
3465 } 3650 }
3651#endif
3466 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3652 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3467 { 3653 {
3468 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3654 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3469 (8 * sizeof (Time)), PropModeReplace,
3470 (unsigned char *)&selection_time, 1); 3655 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3656 ev.property = rq.property;
3657 }
3658 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3659 {
3660 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3661 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3471 ev.property = rq.property; 3662 ev.property = rq.property;
3472 } 3663 }
3473 else if (rq.target == XA_STRING 3664 else if (rq.target == XA_STRING
3474 || rq.target == xa[XA_TEXT] 3665 || rq.target == xa[XA_TEXT]
3475 || rq.target == xa[XA_COMPOUND_TEXT] 3666 || rq.target == xa[XA_COMPOUND_TEXT]
3476 || rq.target == xa[XA_UTF8_STRING] 3667 || rq.target == xa[XA_UTF8_STRING]
3477 ) 3668 )
3478 { 3669 {
3670 XTextProperty ct;
3671 Atom target = rq.target;
3479 short freect = 0; 3672 short freect = 0;
3480 int selectlen; 3673 int selectlen;
3481 wchar_t *cl; 3674 wchar_t *cl;
3482 3675 enum {
3483 target = rq.target; 3676 enc_string = XStringStyle,
3677 enc_text = XStdICCTextStyle,
3678 enc_compound_text = XCompoundTextStyle,
3679#ifdef X_HAVE_UTF8_STRING
3680 enc_utf8 = XUTF8StringStyle,
3681#else
3682 enc_utf8 = -1,
3683#endif
3684 } style;
3484 3685
3485 if (target == XA_STRING) 3686 if (target == XA_STRING)
3486 // we actually don't do XA_STRING, but who cares, as i18n clients 3687 // we actually don't do XA_STRING, but who cares, as i18n clients
3487 // will ask for another format anyways. 3688 // will ask for another format anyways.
3488 style = XStringStyle; 3689 style = enc_string;
3489 else if (target == xa[XA_TEXT]) 3690 else if (target == xa[XA_TEXT])
3490 style = XStdICCTextStyle; 3691 style = enc_text;
3491 else if (target == xa[XA_COMPOUND_TEXT]) 3692 else if (target == xa[XA_COMPOUND_TEXT])
3492 style = XCompoundTextStyle; 3693 style = enc_compound_text;
3493#if X_HAVE_UTF8_STRING 3694#if !ENABLE_MINIMAL
3494 else if (target == xa[XA_UTF8_STRING]) 3695 else if (target == xa[XA_UTF8_STRING])
3495 style = XUTF8StringStyle; 3696 style = enc_utf8;
3496#endif 3697#endif
3497 else 3698 else
3498 { 3699 {
3499 target = xa[XA_COMPOUND_TEXT]; 3700 target = xa[XA_COMPOUND_TEXT];
3500 style = XCompoundTextStyle; 3701 style = enc_compound_text;
3501 } 3702 }
3502 3703
3503 if (selection.text) 3704 if (rq.selection == XA_PRIMARY && selection.text)
3504 { 3705 {
3505 cl = selection.text; 3706 cl = selection.text;
3506 selectlen = selection.len; 3707 selectlen = selection.len;
3507 } 3708 }
3709 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3710 {
3711 cl = selection.clip_text;
3712 selectlen = selection.clip_len;
3713 }
3508 else 3714 else
3509 { 3715 {
3510 cl = L""; 3716 cl = L"";
3511 selectlen = 0; 3717 selectlen = 0;
3512 } 3718 }
3513 3719
3514 // Xwc doesn't handle iso-10646 in wchar_t gracefully, so maybe recode it 3720#if !ENABLE_MINIMAL
3515 // manually for XUTF8StringStyle. 3721 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3722 // so recode it manually
3723 if (style == enc_utf8)
3724 {
3725 freect = 1;
3726 ct.encoding = target;
3727 ct.format = 8;
3728 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3729 ct.nitems = strlen ((char *)ct.value);
3730 }
3731 else
3732#endif
3516 if (XwcTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3733 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3517 freect = 1; 3734 freect = 1;
3518 else 3735 else
3519 { 3736 {
3520 /* if we failed to convert then send it raw */ 3737 /* if we failed to convert then send it raw */
3521 ct.value = (unsigned char *)cl; 3738 ct.value = (unsigned char *)cl;
3522 ct.nitems = selectlen; 3739 ct.nitems = selectlen;
3740 ct.encoding = target;
3523 } 3741 }
3524 3742
3525 XChangeProperty (display->display, rq.requestor, rq.property, 3743 XChangeProperty (dpy, rq.requestor, rq.property,
3526 target, 8, PropModeReplace, 3744 ct.encoding, 8, PropModeReplace,
3527 ct.value, (int)ct.nitems); 3745 ct.value, (int)ct.nitems);
3528 ev.property = rq.property; 3746 ev.property = rq.property;
3529 3747
3530 if (freect) 3748 if (freect)
3531 XFree (ct.value); 3749 XFree (ct.value);
3532 } 3750 }
3533 3751
3534 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3752 XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
3535}
3536
3537/* ------------------------------------------------------------------------- *
3538 * MOUSE ROUTINES *
3539 * ------------------------------------------------------------------------- */
3540
3541/*
3542 * return col/row values corresponding to x/y pixel values
3543 */
3544void
3545rxvt_term::pixel_position (int *x, int *y)
3546{
3547 *x = Pixel2Col (*x);
3548 /* MAX_IT (*x, 0); MIN_IT (*x, (int)TermWin.ncol - 1); */
3549 *y = Pixel2Row (*y);
3550 /* MAX_IT (*y, 0); MIN_IT (*y, (int)TermWin.nrow - 1); */
3551} 3753}
3552 3754
3553/* ------------------------------------------------------------------------- */ 3755/* ------------------------------------------------------------------------- */
3554#ifdef USE_XIM 3756#ifdef USE_XIM
3555void 3757void
3556rxvt_term::im_set_position (XPoint *pos) 3758rxvt_term::im_set_position (XPoint &pos) NOTHROW
3557{ 3759{
3558 XWindowAttributes xwa; 3760 XWindowAttributes xwa;
3559 3761
3560 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3762 XGetWindowAttributes (dpy, vt, &xwa);
3763
3561 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3764 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3562 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3765 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3563} 3766}
3564
3565#endif 3767#endif
3566/* ------------------------------------------------------------------------- */ 3768
3567 3769#if ENABLE_OVERLAY
3770void
3771rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3772{
3773 if (nrow < 1 || ncol < 1)
3774 return;
3775
3776 want_refresh = 1;
3777
3778 scr_overlay_off ();
3779
3780 if (x < 0) x = ncol - w;
3781 if (y < 0) y = nrow - h;
3782
3783 // make space for border
3784 w += 2; min_it (w, ncol);
3785 h += 2; min_it (h, nrow);
3786
3787 x -= 1; clamp_it (x, 0, ncol - w);
3788 y -= 1; clamp_it (y, 0, nrow - h);
3789
3790 ov.x = x; ov.y = y;
3791 ov.w = w; ov.h = h;
3792
3793 ov.text = new text_t *[h];
3794 ov.rend = new rend_t *[h];
3795
3796 for (y = 0; y < h; y++)
3797 {
3798 text_t *tp = ov.text[y] = new text_t[w];
3799 rend_t *rp = ov.rend[y] = new rend_t[w];
3800
3801 text_t t0, t1, t2;
3802 rend_t r = OVERLAY_RSTYLE;
3803
3804 if (y == 0)
3805 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3806 else if (y < h - 1)
3807 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
3808 else
3809 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
3810
3811 *tp++ = t0;
3812 *rp++ = r;
3813
3814 for (x = w - 2; x > 0; --x)
3815 {
3816 *tp++ = t1;
3817 *rp++ = r;
3818 }
3819
3820 *tp = t2;
3821 *rp = r;
3822 }
3823}
3824
3825void
3826rxvt_term::scr_overlay_off () NOTHROW
3827{
3828 if (!ov.text)
3829 return;
3830
3831 want_refresh = 1;
3832
3833 for (int y = 0; y < ov.h; y++)
3834 {
3835 delete [] ov.text[y];
3836 delete [] ov.rend[y];
3837 }
3838
3839 delete [] ov.text; ov.text = 0;
3840 delete [] ov.rend; ov.rend = 0;
3841}
3842
3843void
3844rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3845{
3846 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3847 return;
3848
3849 x++, y++;
3850
3851 ov.text[y][x] = text;
3852 ov.rend[y][x] = rend;
3853}
3854
3855void
3856rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3857{
3858 while (*s)
3859 scr_overlay_set (x++, y, *s++);
3860}
3861
3862void
3863rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3864{
3865 while (*s)
3866 {
3867 text_t t = *s++;
3868 int width = WCWIDTH (t);
3869
3870 while (width--)
3871 {
3872 scr_overlay_set (x++, y, t);
3873 t = NOCHAR;
3874 }
3875 }
3876}
3877
3878void
3879rxvt_term::scr_swap_overlay () NOTHROW
3880{
3881 if (!ov.text)
3882 return;
3883
3884 // hide cursor if it is within the overlay area
3885 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3886 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3887 screen.flags &= ~Screen_VisibleCursor;
3888
3889 // swap screen mem with overlay
3890 for (int y = ov.h; y--; )
3891 {
3892 text_t *t1 = ov.text[y];
3893 rend_t *r1 = ov.rend[y];
3894
3895 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3896 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3897
3898 for (int x = ov.w; x--; )
3899 {
3900 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3901 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3902 }
3903 }
3904}
3905
3906#endif
3568/* ------------------------------------------------------------------------- * 3907/* ------------------------------------------------------------------------- */
3569 * DEBUG ROUTINES *
3570 * ------------------------------------------------------------------------- */
3571#if 0
3572void
3573rxvt_debug_colors (void)
3574{
3575 int color;
3576 const char *name[] =
3577 {
3578 "fg", "bg",
3579 "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"
3580 };
3581 3908
3582 fprintf (stderr, "Color ( ");
3583 if (rstyle & RS_RVid)
3584 fprintf (stderr, "rvid ");
3585 if (rstyle & RS_Bold)
3586 fprintf (stderr, "bold ");
3587 if (rstyle & RS_Blink)
3588 fprintf (stderr, "blink ");
3589 if (rstyle & RS_Uline)
3590 fprintf (stderr, "uline ");
3591 fprintf (stderr, "): ");
3592
3593 color = GET_FGCOLOR (rstyle);
3594#ifndef NO_BRIGHTCOLOR
3595 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3596 {
3597 color -= (minBrightCOLOR - minCOLOR);
3598 fprintf (stderr, "bright ");
3599 }
3600#endif
3601 fprintf (stderr, "%s on ", name[color]);
3602
3603 color = GET_BGCOLOR (rstyle);
3604#ifndef NO_BRIGHTCOLOR
3605 if (color >= minBrightCOLOR && color <= maxBrightCOLOR)
3606 {
3607 color -= (minBrightCOLOR - minCOLOR);
3608 fprintf (stderr, "bright ");
3609 }
3610#endif
3611 fprintf (stderr, "%s\n", name[color]);
3612}
3613#endif

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines