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

Diff Legend

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