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

Diff Legend

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