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

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

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

Diff Legend

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