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

Diff Legend

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