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

Diff Legend

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