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.89 by root, Fri Aug 13 22:38:57 2004 UTC vs.
Revision 1.205 by root, Tue Jan 3 04:18:47 2006 UTC

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

Diff Legend

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