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.77 by root, Mon Jul 26 14:57:12 2004 UTC vs.
Revision 1.198 by root, Tue Dec 27 01:25:42 2005 UTC

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

Diff Legend

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