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.59 by pcg, Mon Mar 15 00:08:11 2004 UTC vs.
Revision 1.218 by root, Mon Jan 9 22:41:41 2006 UTC

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

Diff Legend

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