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

Diff Legend

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