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

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

Diff Legend

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