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

Diff Legend

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