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.104 by root, Tue Aug 17 01:29:12 2004 UTC vs.
Revision 1.188 by root, Thu Dec 22 00:07:47 2005 UTC

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

Diff Legend

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