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

Diff Legend

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