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

Diff Legend

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