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.210 by root, Thu Jan 5 21:21:49 2006 UTC

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

Diff Legend

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