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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.85 by root, Sun Aug 8 16:43:21 2004 UTC vs.
Revision 1.188 by root, Thu Dec 22 00:07:47 2005 UTC

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

Diff Legend

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