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

Diff Legend

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