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

Diff Legend

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