ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

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

Diff Legend

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