ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.68 by pcg, Sun Apr 4 14:35:00 2004 UTC vs.
Revision 1.240 by root, Thu Jan 19 17:21:20 2006 UTC

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

Diff Legend

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