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.66 by pcg, Sun Mar 28 02:07:08 2004 UTC vs.
Revision 1.220 by root, Mon Jan 9 23:18:49 2006 UTC

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

Diff Legend

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