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

Diff Legend

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