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

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

Diff Legend

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