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.240 by root, Thu Jan 19 17:21:20 2006 UTC

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

Diff Legend

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