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.43 by pcg, Wed Mar 3 02:59:53 2004 UTC vs.
Revision 1.349 by root, Thu Oct 14 23:12:11 2010 UTC

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

Diff Legend

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