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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.77 by root, Mon Jul 26 14:57:12 2004 UTC vs.
Revision 1.187 by root, Wed Dec 21 23:57:12 2005 UTC

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

Diff Legend

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