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.57 by pcg, Sun Mar 14 17:33:08 2004 UTC vs.
Revision 1.398 by sf-exg, Wed Nov 2 15:11:51 2011 UTC

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

Diff Legend

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