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

Diff Legend

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