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

Diff Legend

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