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.377 by root, Mon Mar 21 13:46:17 2011 UTC

1/*--------------------------------*-C-*--------------------------------------* 1/*---------------------------------------------------------------------------*
2 * File: screen.c 2 * File: screen.C
3 *---------------------------------------------------------------------------* 3 *---------------------------------------------------------------------------*
4 * 4 *
5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com> 5 * Copyright (c) 1997-2001 Geoff Wing <gcw@pobox.com>
6 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de>
7 * 7 *
8 * This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 * it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 * the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 * (at your option) any later version. 11 * (at your option) any later version.
… …
23/* 23/*
24 * This file handles _all_ screen updates and selections 24 * This file handles _all_ screen updates and selections
25 */ 25 */
26 26
27#include "../config.h" /* NECESSARY */ 27#include "../config.h" /* NECESSARY */
28#define INTERN_SCREEN
29#include "rxvt.h" /* NECESSARY */ 28#include "rxvt.h" /* NECESSARY */
30#include "screen.intpro" /* PROTOS for internal routines */ 29#include "rxvtperl.h" /* NECESSARY */
31 30
32#include <X11/Xmd.h> /* get the typedef for CARD32 */
33
34#include <stdint.h> 31#include <inttypes.h>
35#include <wchar.h>
36 32
37#include "salloc.C" // HACK, should be a seperate compile! 33#include "salloc.C" // HACK, should be a separate compile!
38 34
35static inline void
39inline void fill_text (text_t *start, text_t value, int len) 36fill_text (text_t *start, text_t value, int len)
40{ 37{
41 while (len--) 38 while (len--)
42 *start++ = value; 39 *start++ = value;
43} 40}
44 41
45/* ------------------------------------------------------------------------- */ 42/* ------------------------------------------------------------------------- */
46#define PROP_SIZE 16384
47#define TABSIZE 8 /* default tab size */ 43#define TABSIZE 8 /* default tab size */
48 44
49/* ------------------------------------------------------------------------- * 45/* ------------------------------------------------------------------------- *
50 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * 46 * GENERAL SCREEN AND SELECTION UPDATE ROUTINES *
51 * ------------------------------------------------------------------------- */ 47 * ------------------------------------------------------------------------- */
52#define ZERO_SCROLLBACK() \ 48#define ZERO_SCROLLBACK() \
53 if ((Options & Opt_scrollTtyOutput) == Opt_scrollTtyOutput) \ 49 if (option (Opt_scrollTtyOutput)) \
54 TermWin.view_start = 0 50 view_start = 0
55#define CLEAR_SELECTION() \ 51#define CLEAR_SELECTION() \
56 selection.beg.row = selection.beg.col \ 52 selection.beg.row = selection.beg.col \
57 = selection.end.row = selection.end.col = 0 53 = selection.end.row = selection.end.col = 0
58#define CLEAR_ALL_SELECTION() \ 54#define CLEAR_ALL_SELECTION() \
59 selection.beg.row = selection.beg.col \ 55 selection.beg.row = selection.beg.col \
60 = selection.mark.row = selection.mark.col \ 56 = selection.mark.row = selection.mark.col \
61 = selection.end.row = selection.end.col = 0 57 = selection.end.row = selection.end.col = 0
62 58
63#define ROW_AND_COL_IS_AFTER(A, B, C, D) \ 59#define ROW_AND_COL_IS_AFTER(A, B, C, D) \
64 (((A) > (C)) || (((A) == (C)) && ((B) > (D)))) 60 (((A) > (C)) || (((A) == (C)) && ((B) > (D))))
65#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \ 61#define ROW_AND_COL_IS_BEFORE(A, B, C, D) \
66 (((A) < (C)) || (((A) == (C)) && ((B) < (D)))) 62 (((A) < (C)) || (((A) == (C)) && ((B) < (D))))
67#define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \ 63#define ROW_AND_COL_IN_ROW_AFTER(A, B, C, D) \
68 (((A) == (C)) && ((B) > (D))) 64 (((A) == (C)) && ((B) > (D)))
69#define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \ 65#define ROW_AND_COL_IN_ROW_AT_OR_AFTER(A, B, C, D) \
70 (((A) == (C)) && ((B) >= (D))) 66 (((A) == (C)) && ((B) >= (D)))
71#define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \ 67#define ROW_AND_COL_IN_ROW_BEFORE(A, B, C, D) \
72 (((A) == (C)) && ((B) < (D))) 68 (((A) == (C)) && ((B) < (D)))
73#define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \ 69#define ROW_AND_COL_IN_ROW_AT_OR_BEFORE(A, B, C, D) \
74 (((A) == (C)) && ((B) <= (D))) 70 (((A) == (C)) && ((B) <= (D)))
75 71
76/* these must be row_col_t */ 72/* these must be row_col_t */
77#define ROWCOL_IS_AFTER(X, Y) \ 73#define ROWCOL_IS_AFTER(X, Y) \
78 ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col) 74 ROW_AND_COL_IS_AFTER ((X).row, (X).col, (Y).row, (Y).col)
79#define ROWCOL_IS_BEFORE(X, Y) \ 75#define ROWCOL_IS_BEFORE(X, Y) \
80 ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 76 ROW_AND_COL_IS_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
81#define ROWCOL_IN_ROW_AFTER(X, Y) \ 77#define ROWCOL_IN_ROW_AFTER(X, Y) \
82 ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col) 78 ROW_AND_COL_IN_ROW_AFTER ((X).row, (X).col, (Y).row, (Y).col)
83#define ROWCOL_IN_ROW_BEFORE(X, Y) \ 79#define ROWCOL_IN_ROW_BEFORE(X, Y) \
84 ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 80 ROW_AND_COL_IN_ROW_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
85#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \ 81#define ROWCOL_IN_ROW_AT_OR_AFTER(X, Y) \
86 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col) 82 ROW_AND_COL_IN_ROW_AT_OR_AFTER ((X).row, (X).col, (Y).row, (Y).col)
87#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ 83#define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \
88 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col) 84 ROW_AND_COL_IN_ROW_AT_OR_BEFORE ((X).row, (X).col, (Y).row, (Y).col)
89 85
90/* 86/*
91 * CLEAR_ROWS : clear <num> rows starting from row <row>
92 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> 87 * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y>
93 * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour
94 */ 88 */
95#define drawBuffer TermWin.vt
96
97#define CLEAR_ROWS(row, num) \
98 if (TermWin.mapped) \
99 XClearArea (display->display, drawBuffer, TermWin.int_bwidth, \
100 Row2Pixel (row), (unsigned int)TermWin.width, \
101 (unsigned int)Height2Pixel (num), False)
102
103#define CLEAR_CHARS(x, y, num) \ 89#define CLEAR_CHARS(x, y, num) \
104 if (TermWin.mapped) \ 90 if (mapped) \
105 XClearArea (display->display, drawBuffer, x, y, \ 91 XClearArea (dpy, vt, x, y, \
106 (unsigned int)Width2Pixel (num), \ 92 (unsigned int)Width2Pixel (num), \
107 (unsigned int)Height2Pixel (1), False) 93 (unsigned int)Height2Pixel (1), False)
108
109#define ERASE_ROWS(row, num) \
110 XFillRectangle (display->display, drawBuffer, TermWin.gc, \
111 TermWin.int_bwidth, Row2Pixel (row), \
112 (unsigned int)TermWin.width, \
113 (unsigned int)Height2Pixel (num))
114 94
115/* ------------------------------------------------------------------------- * 95/* ------------------------------------------------------------------------- *
116 * SCREEN `COMMON' ROUTINES * 96 * SCREEN `COMMON' ROUTINES *
117 * ------------------------------------------------------------------------- */ 97 * ------------------------------------------------------------------------- */
98
118/* Fill part/all of a line with blanks. */ 99/* Fill part/all of a line with blanks. */
119void 100void
120rxvt_term::scr_blank_line (text_t *et, rend_t *er, unsigned int width, rend_t efs) 101rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW
121{ 102{
122 efs &= ~RS_baseattrMask; 103 if (!l.t)
104 {
105 lalloc (l);
106 col = 0;
107 width = ncol;
108 }
109
110 l.touch ();
111
112 efs &= ~RS_baseattrMask; // remove italic etc. fontstyles
123 efs = SET_FONT (efs, TermWin.fontset->find_font (' ')); 113 efs = SET_FONT (efs, FONTSET (efs)->find_font (' '));
114
115 text_t *et = l.t + col;
116 rend_t *er = l.r + col;
124 117
125 while (width--) 118 while (width--)
126 { 119 {
127 *et++ = ' '; 120 *et++ = ' ';
128 *er++ = efs; 121 *er++ = efs;
… …
130} 123}
131 124
132/* ------------------------------------------------------------------------- */ 125/* ------------------------------------------------------------------------- */
133/* Fill a full line with blanks - make sure it is allocated first */ 126/* Fill a full line with blanks - make sure it is allocated first */
134void 127void
135rxvt_term::scr_blank_screen_mem (text_t **tp, rend_t **rp, unsigned int row, rend_t efs) 128rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW
136{ 129{
137#ifdef DEBUG_STRICT 130 scr_blank_line (l, 0, ncol, efs);
138 assert ((tp[row] && rp[row]) || (tp[row] == NULL && rp[row] == NULL));
139#endif
140 if (tp[row] == NULL)
141 {
142 tp[row] = (text_t *)talloc->alloc ();
143 rp[row] = (rend_t *)ralloc->alloc ();
144 }
145 131
146 scr_blank_line (tp[row], rp[row], TermWin.ncol, efs); 132 l.l = 0;
133 l.f = 0;
134}
135
136// nuke a single wide character at the given column
137void
138rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW
139{
140 // find begin
141 while (col > 0 && l.t[col] == NOCHAR)
142 col--;
143
144 rend_t rend = l.r[col] & ~RS_baseattrMask;
145 rend = SET_FONT (rend, FONTSET (rend)->find_font (' '));
146
147 l.touch ();
148
149 // found start, nuke
150 do {
151 l.t[col] = ' ';
152 l.r[col] = rend;
153 col++;
154 } while (col < ncol && l.t[col] == NOCHAR);
147} 155}
148 156
149/* ------------------------------------------------------------------------- * 157/* ------------------------------------------------------------------------- *
150 * SCREEN INITIALISATION * 158 * SCREEN INITIALISATION *
151 * ------------------------------------------------------------------------- */ 159 * ------------------------------------------------------------------------- */
160
152void 161void
153rxvt_term::scr_reset () 162rxvt_term::scr_reset ()
154{ 163{
155 unsigned int ncol, nrow, total_rows, prev_total_rows;
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 rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c));
904
905 // if the character doesn't fit into the remaining columns...
906 if (expect_false (screen.cur.col > ncol - width && ncol >= width))
894 { 907 {
908 if (screen.flags & Screen_Autowrap)
909 {
910 // ... artificially enlargen the previous one
911 c = NOCHAR;
912 // and try the same character next loop iteration
913 --str;
914 }
915 else
916 screen.cur.col = ncol - width;
917 }
918
919 // nuke the character at this position, if required
920 // due to wonderful coincidences everywhere else in this loop
921 // we never have to check for overwriting a wide char itself,
922 // only its tail.
923 if (expect_false (line->t[screen.cur.col] == NOCHAR))
924 scr_kill_char (*line, screen.cur.col);
925
926 line->touch ();
927
895 do 928 do
896 { 929 {
897 stp[screen.cur.col] = c; 930 line->t[screen.cur.col] = c;
898 srp[screen.cur.col] = rend; 931 line->r[screen.cur.col] = rend;
899 932
900 if (screen.cur.col < last_col - 1) 933 if (expect_true (screen.cur.col < ncol - 1))
901 screen.cur.col++; 934 screen.cur.col++;
902 else 935 else
903 { 936 {
904 screen.tlen[row] = last_col; 937 line->l = ncol;
905 if (screen.flags & Screen_Autowrap) 938 if (screen.flags & Screen_Autowrap)
906 screen.flags |= Screen_WrapNext; 939 screen.flags |= Screen_WrapNext;
907 break; 940
941 goto end_of_line;
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 for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++)
916 { 950 {
917 stp[c] = ' '; 951 line->t[c] = ' ';
918 srp[c] = rend; 952 line->r[c] = rend;
919 } 953 }
954
955end_of_line:
956 ;
957 }
958#if ENABLE_COMBINING
959 else // width == 0
920 } 960 {
921 else 961 if (c != 0xfeff) // ignore BOM
922 (void)0; /* handle combining character etc. here. */ 962 {
923 } 963 // handle combining characters
964 // we just tag the accent on the previous on-screen character.
965 // this is arguably not correct, but also arguably not wrong.
966 // we don't handle double-width characters nicely yet.
967 line_t *linep;
968 text_t *tp;
969 rend_t *rp;
924 970
925 if (screen.tlen[row] != -1) /* XXX: think about this */ 971 if (screen.cur.col > 0)
926 MAX_IT (screen.tlen[row], screen.cur.col); 972 {
973 linep = line;
974 tp = line->t + screen.cur.col - 1;
975 rp = line->r + screen.cur.col - 1;
976 }
977 else if (screen.cur.row > 0
978 && ROW(screen.cur.row - 1).is_longer ())
979 {
980 linep = &ROW(screen.cur.row - 1);
981 tp = line->t + ncol - 1;
982 rp = line->r + ncol - 1;
983 }
984 else
985 continue;
927 986
928 /* 987 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 988
936#ifdef DEBUG_STRICT 989 while (*tp == NOCHAR && tp > linep->t)
990 tp--, rp--;
991
992 // first try to find a precomposed character
993 unicode_t n = rxvt_compose (*tp, c);
994 if (n == NOCHAR)
995 n = rxvt_composite.compose (*tp, c);
996
997 *tp = n;
998 *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp));
999 }
1000 }
1001#endif
1002 }
1003
1004 max_it (line->l, screen.cur.col);
1005
937 assert (screen.cur.row >= 0); 1006 assert (screen.cur.row >= 0);
938#else /* drive with your eyes closed */
939 MAX_IT (screen.cur.row, 0);
940#endif
941} 1007}
942 1008
943/* ------------------------------------------------------------------------- */ 1009/* ------------------------------------------------------------------------- */
944/* 1010/*
945 * Process Backspace. Move back the cursor back a position, wrap if have to 1011 * Process Backspace. Move back the cursor back a position, wrap if have to
946 * XTERM_SEQ: CTRL-H 1012 * XTERM_SEQ: CTRL-H
947 */ 1013 */
948void 1014void
949rxvt_term::scr_backspace () 1015rxvt_term::scr_backspace () NOTHROW
950{ 1016{
951 want_refresh = 1;
952 if (screen.cur.col == 0) 1017 if (screen.cur.col == 0)
953 { 1018 {
954 if (screen.cur.row > 0) 1019 if (screen.cur.row > 0)
955 { 1020 {
956#ifdef TERMCAP_HAS_BW 1021#ifdef TERMCAP_HAS_BW
957 screen.cur.col = TermWin.ncol - 1; 1022 screen.cur.col = ncol - 1;
958 screen.cur.row--; 1023 --screen.cur.row;
959 return;
960#endif
961 1024
1025 want_refresh = 1;
1026#endif
962 } 1027 }
963 } 1028 }
964 else if ((screen.flags & Screen_WrapNext) == 0) 1029 else if (screen.flags & Screen_WrapNext)
1030 screen.flags &= ~Screen_WrapNext;
1031 else
965 scr_gotorc (0, -1, RELATIVE); 1032 scr_gotorc (0, -1, RELATIVE);
966 screen.flags &= ~Screen_WrapNext;
967} 1033}
968 1034
969/* ------------------------------------------------------------------------- */ 1035/* ------------------------------------------------------------------------- */
970/* 1036/*
971 * Process Horizontal Tab 1037 * Process Horizontal Tab
972 * count: +ve = forward; -ve = backwards 1038 * count: +ve = forward; -ve = backwards
973 * XTERM_SEQ: CTRL-I 1039 * XTERM_SEQ: CTRL-I
974 */ 1040 */
975void 1041void
976rxvt_term::scr_tab (int count) 1042rxvt_term::scr_tab (int count, bool ht) NOTHROW
977{ 1043{
978 int i, x; 1044 int i, x;
979 1045
980 D_SCREEN ((stderr, "rxvt_scr_tab (%d)", count));
981 want_refresh = 1; 1046 want_refresh = 1;
982 i = x = screen.cur.col; 1047 i = x = screen.cur.col;
1048
983 if (count == 0) 1049 if (count == 0)
984 return; 1050 return;
985 else if (count > 0) 1051 else if (count > 0)
986 { 1052 {
1053 line_t &l = ROW(screen.cur.row);
1054 rend_t base_rend = l.r[i];
1055 ht &= l.t[i] == ' ';
1056
987 for (; ++i < TermWin.ncol; ) 1057 for (; ++i < ncol; )
988 if (tabs[i]) 1058 if (tabs[i])
989 { 1059 {
990 x = i; 1060 x = i;
1061
991 if (!--count) 1062 if (!--count)
992 break; 1063 break;
993 } 1064 }
1065 else
1066 ht &= l.t[i] == ' '
1067 && RS_SAME (l.r[i], base_rend);
1068
994 if (count) 1069 if (count)
995 x = TermWin.ncol - 1; 1070 x = ncol - 1;
1071
1072 // store horizontal tab commands as characters inside the text
1073 // buffer so they can be selected and pasted.
1074 if (ht && option (Opt_pastableTabs))
1075 {
1076 base_rend = SET_FONT (base_rend, 0);
1077
1078 l.touch (x);
1079
1080 i = screen.cur.col;
1081
1082 l.t[i] = '\t';
1083 l.r[i] = base_rend;
1084
1085 while (++i < x)
1086 {
1087 l.t[i] = NOCHAR;
1088 l.r[i] = base_rend;
1089 }
1090 }
996 } 1091 }
997 else /* if (count < 0) */ 1092 else /* if (count < 0) */
998 { 1093 {
999 for (; --i >= 0; ) 1094 for (; --i >= 0; )
1000 if (tabs[i]) 1095 if (tabs[i])
1001 { 1096 {
1002 x = i; 1097 x = i;
1003 if (!++count) 1098 if (!++count)
1004 break; 1099 break;
1005 } 1100 }
1101
1006 if (count) 1102 if (count)
1007 x = 0; 1103 x = 0;
1008 } 1104 }
1105
1009 if (x != screen.cur.col) 1106 if (x != screen.cur.col)
1010 scr_gotorc (0, x, R_RELATIVE); 1107 scr_gotorc (0, x, R_RELATIVE);
1011} 1108}
1012 1109
1013/* ------------------------------------------------------------------------- */ 1110/* ------------------------------------------------------------------------- */
… …
1015 * Process DEC Back Index 1112 * Process DEC Back Index
1016 * XTERM_SEQ: ESC 6 1113 * XTERM_SEQ: ESC 6
1017 * Move cursor left in row. If we're at the left boundary, shift everything 1114 * Move cursor left in row. If we're at the left boundary, shift everything
1018 * in that row right. Clear left column. 1115 * in that row right. Clear left column.
1019 */ 1116 */
1020#ifndef NO_FRILLS 1117#if !ENABLE_MINIMAL
1021void 1118void
1022rxvt_term::scr_backindex () 1119rxvt_term::scr_backindex () NOTHROW
1023{ 1120{
1024 if (screen.cur.col > 0) 1121 if (screen.cur.col > 0)
1025 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); 1122 scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE);
1026 else 1123 else
1027 {
1028 if (screen.tlen[screen.cur.row + TermWin.saveLines] == 0)
1029 return; /* um, yeah? */
1030 scr_insdel_chars (1, INSERT); 1124 scr_insdel_chars (1, INSERT);
1031 }
1032} 1125}
1033#endif 1126#endif
1034/* ------------------------------------------------------------------------- */ 1127/* ------------------------------------------------------------------------- */
1035/* 1128/*
1036 * Process DEC Forward Index 1129 * Process DEC Forward Index
1037 * XTERM_SEQ: ESC 9 1130 * XTERM_SEQ: ESC 9
1038 * Move cursor right in row. If we're at the right boundary, shift everything 1131 * Move cursor right in row. If we're at the right boundary, shift everything
1039 * in that row left. Clear right column. 1132 * in that row left. Clear right column.
1040 */ 1133 */
1041#ifndef NO_FRILLS 1134#if !ENABLE_MINIMAL
1042void 1135void
1043rxvt_term::scr_forwardindex () 1136rxvt_term::scr_forwardindex () NOTHROW
1044{ 1137{
1045 int row;
1046
1047 if (screen.cur.col < TermWin.ncol - 1) 1138 if (screen.cur.col < ncol - 1)
1048 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); 1139 scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE);
1049 else 1140 else
1050 { 1141 {
1051 row = screen.cur.row + TermWin.saveLines; 1142 line_t &l = ROW(screen.cur.row);
1052 if (screen.tlen[row] == 0) 1143
1053 return; /* um, yeah? */ 1144 l.touch ();
1054 else if (screen.tlen[row] == -1) 1145 l.is_longer (0);
1055 screen.tlen[row] = TermWin.ncol; 1146
1056 scr_gotorc (0, 0, R_RELATIVE); 1147 scr_gotorc (0, 0, R_RELATIVE);
1057 scr_insdel_chars (1, DELETE); 1148 scr_insdel_chars (1, DELETE);
1058 scr_gotorc (0, TermWin.ncol - 1, R_RELATIVE); 1149 scr_gotorc (0, ncol - 1, R_RELATIVE);
1059 } 1150 }
1060} 1151}
1061#endif 1152#endif
1062 1153
1063/* ------------------------------------------------------------------------- */ 1154/* ------------------------------------------------------------------------- */
1064/* 1155/*
1065 * Goto Row/Column 1156 * Goto Row/Column
1066 */ 1157 */
1067void 1158void
1068rxvt_term::scr_gotorc (int row, int col, int relative) 1159rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW
1069{ 1160{
1070 want_refresh = 1; 1161 want_refresh = 1;
1071 ZERO_SCROLLBACK (); 1162 ZERO_SCROLLBACK ();
1072 1163
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) 1164 screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col;
1076 : col); 1165 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 1166
1080 screen.flags &= ~Screen_WrapNext; 1167 screen.flags &= ~Screen_WrapNext;
1168
1081 if (relative & R_RELATIVE) 1169 if (relative & R_RELATIVE)
1082 { 1170 {
1083 if (row > 0) 1171 if (row > 0)
1084 { 1172 {
1085 if (screen.cur.row <= screen.bscroll 1173 if (screen.cur.row <= screen.bscroll
… …
1098 } 1186 }
1099 } 1187 }
1100 else 1188 else
1101 { 1189 {
1102 if (screen.flags & Screen_Relative) 1190 if (screen.flags & Screen_Relative)
1191 {
1103 { /* relative origin mode */ 1192 /* relative origin mode */
1104 screen.cur.row = row + screen.tscroll; 1193 screen.cur.row = row + screen.tscroll;
1105 MIN_IT (screen.cur.row, screen.bscroll); 1194 min_it (screen.cur.row, screen.bscroll);
1106 } 1195 }
1107 else 1196 else
1108 screen.cur.row = row; 1197 screen.cur.row = row;
1109 } 1198 }
1110 MAX_IT (screen.cur.row, 0);
1111 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1);
1112 1199
1113 while (screen.cur.col > 0 1200 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} 1201}
1117 1202
1118/* ------------------------------------------------------------------------- */ 1203/* ------------------------------------------------------------------------- */
1119/* 1204/*
1120 * direction should be UP or DN 1205 * direction should be UP or DN
1121 */ 1206 */
1122void 1207void
1123rxvt_term::scr_index (enum page_dirn direction) 1208rxvt_term::scr_index (enum page_dirn direction) NOTHROW
1124{ 1209{
1125 int dirn; 1210 int dirn;
1126 1211
1127 want_refresh = 1; 1212 want_refresh = 1;
1213 ZERO_SCROLLBACK ();
1214
1128 dirn = ((direction == UP) ? 1 : -1); 1215 dirn = ((direction == UP) ? 1 : -1);
1129 D_SCREEN ((stderr, "rxvt_scr_index (%d)", dirn));
1130
1131 ZERO_SCROLLBACK ();
1132 1216
1133 screen.flags &= ~Screen_WrapNext; 1217 screen.flags &= ~Screen_WrapNext;
1218
1134 if ((screen.cur.row == screen.bscroll && direction == UP) 1219 if ((screen.cur.row == screen.bscroll && direction == UP)
1135 || (screen.cur.row == screen.tscroll && direction == DN)) 1220 || (screen.cur.row == screen.tscroll && direction == DN))
1136 scr_scroll_text (screen.tscroll, screen.bscroll, dirn, 0); 1221 scr_scroll_text (screen.tscroll, screen.bscroll, dirn);
1137 else 1222 else
1138 screen.cur.row += dirn; 1223 screen.cur.row += dirn;
1139 MAX_IT (screen.cur.row, 0); 1224
1140 MIN_IT (screen.cur.row, (int32_t)TermWin.nrow - 1); 1225 clamp_it (screen.cur.row, 0, nrow - 1);
1141 selection_check (0); 1226 selection_check (0);
1142} 1227}
1143 1228
1144/* ------------------------------------------------------------------------- */ 1229/* ------------------------------------------------------------------------- */
1145/* 1230/*
1146 * Erase part or whole of a line 1231 * Erase part or whole of a line
1147 * XTERM_SEQ: Clear line to right: ESC [ 0 K 1232 * XTERM_SEQ: Clear line to right: ESC [ 0 K
1148 * XTERM_SEQ: Clear line to left : ESC [ 1 K 1233 * XTERM_SEQ: Clear line to left : ESC [ 1 K
1149 * XTERM_SEQ: Clear whole line : ESC [ 2 K 1234 * XTERM_SEQ: Clear whole line : ESC [ 2 K
1235 * extension: clear to right unless wrapped: ESC [ 3 K
1150 */ 1236 */
1151void 1237void
1152rxvt_term::scr_erase_line (int mode) 1238rxvt_term::scr_erase_line (int mode) NOTHROW
1153{ 1239{
1154 unsigned int row, col, num; 1240 unsigned int col, num;
1155 1241
1156 want_refresh = 1; 1242 want_refresh = 1;
1157 D_SCREEN ((stderr, "rxvt_scr_erase_line (%d) at screen row: %d", mode, screen.cur.row));
1158 ZERO_SCROLLBACK (); 1243 ZERO_SCROLLBACK ();
1159 1244
1160 selection_check (1); 1245 selection_check (1);
1161 1246
1162 screen.flags &= ~Screen_WrapNext; 1247 line_t &line = ROW(screen.cur.row);
1163 1248
1164 row = TermWin.saveLines + screen.cur.row; 1249 line.touch ();
1250 line.is_longer (0);
1251
1165 switch (mode) 1252 switch (mode)
1166 { 1253 {
1254 case 3:
1255 if (screen.flags & Screen_WrapNext)
1256 return;
1257
1258 /* fall through */
1259
1167 case 0: /* erase to end of line */ 1260 case 0: /* erase to end of line */
1168 col = screen.cur.col; 1261 col = screen.cur.col;
1169 num = TermWin.ncol - col; 1262 num = ncol - col;
1170 MIN_IT (screen.tlen[row], (int16_t)col); 1263 min_it (line.l, col);
1264
1171 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) 1265 if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)
1172 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) 1266 || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur))
1173 CLEAR_SELECTION (); 1267 CLEAR_SELECTION ();
1174 break; 1268 break;
1269
1175 case 1: /* erase to beginning of line */ 1270 case 1: /* erase to beginning of line */
1176 col = 0; 1271 col = 0;
1177 num = screen.cur.col + 1; 1272 num = screen.cur.col + 1;
1273
1178 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) 1274 if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur)
1179 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) 1275 || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur))
1180 CLEAR_SELECTION (); 1276 CLEAR_SELECTION ();
1181 break; 1277 break;
1278
1182 case 2: /* erase whole line */ 1279 case 2: /* erase whole line */
1183 col = 0; 1280 col = 0;
1184 num = TermWin.ncol; 1281 num = ncol;
1185 screen.tlen[row] = 0; 1282 line.l = 0;
1186 if (selection.beg.row <= screen.cur.row 1283 if (selection.beg.row <= screen.cur.row
1187 && selection.end.row >= screen.cur.row) 1284 && selection.end.row >= screen.cur.row)
1188 CLEAR_SELECTION (); 1285 CLEAR_SELECTION ();
1189 break; 1286 break;
1190 default: 1287 default:
1191 return; 1288 return;
1192 } 1289 }
1193 1290
1194 if (screen.text[row]) 1291 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} 1292}
1200 1293
1201/* ------------------------------------------------------------------------- */ 1294/* ------------------------------------------------------------------------- */
1202/* 1295/*
1203 * Erase part of whole of the screen 1296 * Erase part of whole of the screen
1204 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J 1297 * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J
1205 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J 1298 * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J
1206 * XTERM_SEQ: Clear whole screen : ESC [ 2 J 1299 * XTERM_SEQ: Clear whole screen : ESC [ 2 J
1207 */ 1300 */
1208void 1301void
1209rxvt_term::scr_erase_screen (int mode) 1302rxvt_term::scr_erase_screen (int mode) NOTHROW
1210{ 1303{
1211 int num; 1304 int num;
1212 int32_t row, row_offset; 1305 int32_t row;
1213 rend_t ren; 1306 rend_t ren;
1214 XGCValues gcvalue; 1307 XGCValues gcvalue;
1215 1308
1216 want_refresh = 1; 1309 want_refresh = 1;
1217 D_SCREEN ((stderr, "rxvt_scr_erase_screen (%d) at screen row: %d", mode, screen.cur.row));
1218 ZERO_SCROLLBACK (); 1310 ZERO_SCROLLBACK ();
1219 row_offset = (int32_t)TermWin.saveLines;
1220 1311
1221 switch (mode) 1312 switch (mode)
1222 { 1313 {
1223 case 0: /* erase to end of screen */ 1314 case 0: /* erase to end of screen */
1224 selection_check (1); 1315 selection_check (1);
1225 scr_erase_line (0); 1316 scr_erase_line (0);
1226 row = screen.cur.row + 1; /* possible OOB */ 1317 row = screen.cur.row + 1; /* possible OOB */
1227 num = TermWin.nrow - row; 1318 num = nrow - row;
1228 break; 1319 break;
1229 case 1: /* erase to beginning of screen */ 1320 case 1: /* erase to beginning of screen */
1230 selection_check (3); 1321 selection_check (3);
1231 scr_erase_line (1); 1322 scr_erase_line (1);
1232 row = 0; 1323 row = 0;
1233 num = screen.cur.row; 1324 num = screen.cur.row;
1234 break; 1325 break;
1235 case 2: /* erase whole screen */ 1326 case 2: /* erase whole screen */
1236 selection_check (3); 1327 selection_check (3);
1237 row = 0; 1328 row = 0;
1238 num = TermWin.nrow; 1329 num = nrow;
1239 break; 1330 break;
1240 default: 1331 default:
1241 return; 1332 return;
1242 } 1333 }
1243 refresh_type |= REFRESH_BOUNDS; 1334
1244 if (selection.op && current_screen == selection.screen 1335 if (selection.op && current_screen == selection.screen
1245 && ((selection.beg.row >= row && selection.beg.row <= row + num) 1336 && ((selection.beg.row >= row && selection.beg.row <= row + num)
1246 || (selection.end.row >= row 1337 || (selection.end.row >= row
1247 && selection.end.row <= row + num))) 1338 && selection.end.row <= row + num)))
1248 CLEAR_SELECTION (); 1339 CLEAR_SELECTION ();
1340
1249 if (row >= TermWin.nrow) /* Out Of Bounds */ 1341 if (row >= nrow) /* Out Of Bounds */
1250 return; 1342 return;
1251 MIN_IT (num, (TermWin.nrow - row)); 1343
1344 min_it (num, nrow - row);
1345
1252 if (rstyle & (RS_RVid | RS_Uline)) 1346 if (rstyle & (RS_Blink | RS_RVid | RS_Uline))
1253 ren = (rend_t) ~RS_None; 1347 ren = (rend_t) ~RS_None;
1254 else if (GET_BASEBG (rstyle) == Color_bg) 1348 else if (GET_BASEBG (rstyle) == Color_bg)
1255 { 1349 {
1256 ren = DEFAULT_RSTYLE; 1350 ren = DEFAULT_RSTYLE;
1257 CLEAR_ROWS (row, num); 1351
1352 if (mapped)
1353 XClearArea (dpy, vt, 0,
1354 Row2Pixel (row - view_start), (unsigned int)width,
1355 (unsigned int)Height2Pixel (num), False);
1258 } 1356 }
1259 else 1357 else
1260 { 1358 {
1261 ren = (rstyle & (RS_fgMask | RS_bgMask)); 1359 ren = rstyle & (RS_fgMask | RS_bgMask);
1360
1361 if (mapped)
1362 {
1262 gcvalue.foreground = PixColors[GET_BGCOLOR (rstyle)]; 1363 gcvalue.foreground = pix_colors[bgcolor_of (rstyle)];
1263 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1364 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1264 ERASE_ROWS (row, num); 1365 XFillRectangle (dpy, vt, gc,
1366 0, Row2Pixel (row - view_start),
1367 (unsigned int)width,
1368 (unsigned int)Height2Pixel (num));
1265 gcvalue.foreground = PixColors[Color_fg]; 1369 gcvalue.foreground = pix_colors[Color_fg];
1266 XChangeGC (display->display, TermWin.gc, GCForeground, &gcvalue); 1370 XChangeGC (dpy, gc, GCForeground, &gcvalue);
1371 }
1267 } 1372 }
1373
1268 for (; num--; row++) 1374 for (; num--; row++)
1269 { 1375 {
1270 scr_blank_screen_mem (screen.text, screen.rend, 1376 scr_blank_screen_mem (ROW(row), rstyle);
1271 (unsigned int) (row + row_offset), rstyle); 1377
1272 screen.tlen[row + row_offset] = 0; 1378 if (row - view_start < nrow)
1273 scr_blank_line (drawn_text[row], drawn_rend[row], 1379 scr_blank_line (drawn_buf [row - view_start], 0, ncol, ren);
1274 (unsigned int)TermWin.ncol, ren);
1275 } 1380 }
1276} 1381}
1382
1383#if !ENABLE_MINIMAL
1384void
1385rxvt_term::scr_erase_savelines () NOTHROW
1386{
1387 want_refresh = 1;
1388 ZERO_SCROLLBACK ();
1389
1390 top_row = 0;
1391}
1392#endif
1277 1393
1278/* ------------------------------------------------------------------------- */ 1394/* ------------------------------------------------------------------------- */
1279/* 1395/*
1280 * Fill the screen with `E's 1396 * Fill the screen with `E's
1281 * XTERM_SEQ: Screen Alignment Test: ESC # 8 1397 * XTERM_SEQ: Screen Alignment Test: ESC # 8
1282 */ 1398 */
1283void 1399void
1284rxvt_term::scr_E () 1400rxvt_term::scr_E () NOTHROW
1285{ 1401{
1286 int i, j, k; 1402 rend_t fs;
1287 rend_t *r1, fs;
1288 1403
1289 want_refresh = 1; 1404 want_refresh = 1;
1405 ZERO_SCROLLBACK ();
1406
1290 num_scr_allow = 0; 1407 num_scr_allow = 0;
1291 ZERO_SCROLLBACK ();
1292 selection_check (3); 1408 selection_check (3);
1293 1409
1294 fs = SET_FONT (rstyle, TermWin.fontset->find_font ('E')); 1410 fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E'));
1295 for (k = TermWin.saveLines, i = TermWin.nrow; i--; k++) 1411 for (int row = nrow; row--; )
1296 { 1412 {
1297 screen.tlen[k] = TermWin.ncol; /* make the `E's selectable */ 1413 line_t &line = ROW(row);
1414
1298 fill_text (screen.text[k], 'E', TermWin.ncol); 1415 fill_text (line.t, 'E', ncol);
1299 for (r1 = screen.rend[k], j = TermWin.ncol; j--; ) 1416 rend_t *r1 = line.r;
1417
1418 for (int j = ncol; j--; )
1300 *r1++ = fs; 1419 *r1++ = fs;
1420
1421 line.is_longer (0);
1422 line.touch (ncol);
1301 } 1423 }
1302} 1424}
1303 1425
1304/* ------------------------------------------------------------------------- */ 1426/* ------------------------------------------------------------------------- */
1305/* 1427/*
1306 * Insert/Delete <count> lines 1428 * Insert/Delete <count> lines
1307 */ 1429 */
1308void 1430void
1309rxvt_term::scr_insdel_lines (int count, int insdel) 1431rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW
1310{ 1432{
1311 int end; 1433 int end;
1312 1434
1313 ZERO_SCROLLBACK (); 1435 ZERO_SCROLLBACK ();
1314 1436
1315 selection_check (1); 1437 selection_check (1);
1316 1438
… …
1323 if (insdel == DELETE) 1445 if (insdel == DELETE)
1324 return; 1446 return;
1325 else if (insdel == INSERT) 1447 else if (insdel == INSERT)
1326 count = end; 1448 count = end;
1327 } 1449 }
1328 screen.flags &= ~Screen_WrapNext;
1329 1450
1451 scr_do_wrap ();
1452
1330 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count, 0); 1453 scr_scroll_text (screen.cur.row, screen.bscroll, insdel * count);
1331} 1454}
1332 1455
1333/* ------------------------------------------------------------------------- */ 1456/* ------------------------------------------------------------------------- */
1334/* 1457/*
1335 * Insert/Delete <count> characters from the current position 1458 * Insert/Delete <count> characters from the current position
1336 */ 1459 */
1337void 1460void
1338rxvt_term::scr_insdel_chars (int count, int insdel) 1461rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW
1339{ 1462{
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; 1463 want_refresh = 1;
1347 ZERO_SCROLLBACK (); 1464 ZERO_SCROLLBACK ();
1348 1465
1349 if (count <= 0) 1466 if (count <= 0)
1350 return; 1467 return;
1351 1468
1469 scr_do_wrap ();
1470
1352 selection_check (1); 1471 selection_check (1);
1353 MIN_IT (count, (TermWin.ncol - screen.cur.col)); 1472 min_it (count, ncol - screen.cur.col);
1354 1473
1355 row = screen.cur.row + TermWin.saveLines; 1474 int row = screen.cur.row;
1356 screen.flags &= ~Screen_WrapNext;
1357 1475
1358 stp = screen.text[row]; 1476 line_t *line = &ROW(row);
1359 srp = screen.rend[row]; 1477
1360 slp = & (screen.tlen[row]); 1478 line->touch ();
1479 line->is_longer (0);
1480
1481 // nuke wide spanning the start
1482 if (line->t[screen.cur.col] == NOCHAR)
1483 scr_kill_char (*line, screen.cur.col);
1484
1361 switch (insdel) 1485 switch (insdel)
1362 { 1486 {
1363 case INSERT: 1487 case INSERT:
1364 for (col = TermWin.ncol - 1; (col - count) >= screen.cur.col; 1488 line->l = min (line->l + count, ncol);
1365 col--) 1489
1490 if (line->t[screen.cur.col] == NOCHAR)
1491 scr_kill_char (*line, screen.cur.col);
1492
1493 for (int col = ncol - 1; (col - count) >= screen.cur.col; col--)
1366 { 1494 {
1367 stp[col] = stp[col - count]; 1495 line->t[col] = line->t[col - count];
1368 srp[col] = srp[col - count]; 1496 line->r[col] = line->r[col - count];
1369 } 1497 }
1370 if (*slp != -1) 1498
1371 {
1372 *slp += count;
1373 MIN_IT (*slp, TermWin.ncol);
1374 }
1375 if (selection.op && current_screen == selection.screen 1499 if (selection.op && current_screen == selection.screen
1376 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1500 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1377 { 1501 {
1378 if (selection.end.row != screen.cur.row 1502 if (selection.end.row != screen.cur.row
1379 || (selection.end.col + count >= TermWin.ncol)) 1503 || (selection.end.col + count >= ncol))
1380 CLEAR_SELECTION (); 1504 CLEAR_SELECTION ();
1381 else 1505 else
1506 {
1382 { /* shift selection */ 1507 /* shift selection */
1383 selection.beg.col += count; 1508 selection.beg.col += count;
1384 selection.mark.col += count; /* XXX: yes? */ 1509 selection.mark.col += count; /* XXX: yes? */
1385 selection.end.col += count; 1510 selection.end.col += count;
1386 } 1511 }
1387 } 1512 }
1388 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1513
1389 (unsigned int)count, rstyle); 1514 scr_blank_line (*line, screen.cur.col, count, rstyle);
1390 break; 1515 break;
1516
1391 case ERASE: 1517 case ERASE:
1392 screen.cur.col += count; /* don't worry if > TermWin.ncol */ 1518 screen.cur.col += count; /* don't worry if > ncol */
1393 selection_check (1); 1519 selection_check (1);
1394 screen.cur.col -= count; 1520 screen.cur.col -= count;
1395 scr_blank_line (& (stp[screen.cur.col]), & (srp[screen.cur.col]), 1521
1396 (unsigned int)count, rstyle); 1522 // nuke wide char after the end
1523 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1524 scr_kill_char (*line, screen.cur.col + count);
1525
1526 scr_blank_line (*line, screen.cur.col, count, rstyle);
1397 break; 1527 break;
1528
1398 case DELETE: 1529 case DELETE:
1399 tr = srp[TermWin.ncol - 1] 1530 line->l = max (line->l - count, 0);
1400 & (RS_fgMask | RS_bgMask | RS_baseattrMask); 1531
1532 // nuke wide char spanning the end
1533 if (screen.cur.col + count < ncol && line->t[screen.cur.col + count] == NOCHAR)
1534 scr_kill_char (*line, screen.cur.col + count);
1535
1401 for (col = screen.cur.col; (col + count) < TermWin.ncol; col++) 1536 for (int col = screen.cur.col; (col + count) < ncol; col++)
1402 { 1537 {
1403 stp[col] = stp[col + count]; 1538 line->t[col] = line->t[col + count];
1404 srp[col] = srp[col + count]; 1539 line->r[col] = line->r[col + count];
1405 } 1540 }
1406 scr_blank_line (& (stp[TermWin.ncol - count]), 1541
1407 & (srp[TermWin.ncol - count]), 1542 scr_blank_line (*line, ncol - count, count, rstyle);
1408 (unsigned int)count, tr); 1543
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 1544 if (selection.op && current_screen == selection.screen
1414 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur)) 1545 && ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur))
1415 { 1546 {
1416 if (selection.end.row != screen.cur.row 1547 if (selection.end.row != screen.cur.row
1417 || (screen.cur.col >= selection.beg.col - count) 1548 || (screen.cur.col >= selection.beg.col - count)
1418 || selection.end.col >= TermWin.ncol) 1549 || selection.end.col >= ncol)
1419 CLEAR_SELECTION (); 1550 CLEAR_SELECTION ();
1420 else 1551 else
1421 { 1552 {
1422 /* shift selection */ 1553 /* shift selection */
1423 selection.beg.col -= count; 1554 selection.beg.col -= count;
1424 selection.mark.col -= count; /* XXX: yes? */ 1555 selection.mark.col -= count; /* XXX: yes? */
1425 selection.end.col -= count; 1556 selection.end.col -= count;
1426 } 1557 }
1427 } 1558 }
1559
1428 break; 1560 break;
1429 } 1561 }
1430} 1562}
1431 1563
1432/* ------------------------------------------------------------------------- */ 1564/* ------------------------------------------------------------------------- */
1433/* 1565/*
1434 * Set the scrolling region 1566 * Set the scrolling region
1435 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r 1567 * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r
1436 */ 1568 */
1437void 1569void
1438rxvt_term::scr_scroll_region (int top, int bot) 1570rxvt_term::scr_scroll_region (int top, int bot) NOTHROW
1439{ 1571{
1440 MAX_IT (top, 0); 1572 max_it (top, 0);
1441 MIN_IT (bot, (int)TermWin.nrow - 1); 1573 min_it (bot, nrow - 1);
1574
1442 if (top > bot) 1575 if (top > bot)
1443 return; 1576 return;
1577
1444 screen.tscroll = top; 1578 screen.tscroll = top;
1445 screen.bscroll = bot; 1579 screen.bscroll = bot;
1446 scr_gotorc (0, 0, 0); 1580 scr_gotorc (0, 0, 0);
1447} 1581}
1448 1582
… …
1451 * Make the cursor visible/invisible 1585 * Make the cursor visible/invisible
1452 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h 1586 * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h
1453 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l 1587 * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l
1454 */ 1588 */
1455void 1589void
1456rxvt_term::scr_cursor_visible (int mode) 1590rxvt_term::scr_cursor_visible (int mode) NOTHROW
1457{ 1591{
1458 want_refresh = 1; 1592 want_refresh = 1;
1593
1459 if (mode) 1594 if (mode)
1460 screen.flags |= Screen_VisibleCursor; 1595 screen.flags |= Screen_VisibleCursor;
1461 else 1596 else
1462 screen.flags &= ~Screen_VisibleCursor; 1597 screen.flags &= ~Screen_VisibleCursor;
1463} 1598}
… …
1467 * Set/unset automatic wrapping 1602 * Set/unset automatic wrapping
1468 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h 1603 * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h
1469 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l 1604 * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l
1470 */ 1605 */
1471void 1606void
1472rxvt_term::scr_autowrap (int mode) 1607rxvt_term::scr_autowrap (int mode) NOTHROW
1473{ 1608{
1474 if (mode) 1609 if (mode)
1475 screen.flags |= Screen_Autowrap; 1610 screen.flags |= Screen_Autowrap;
1476 else 1611 else
1477 screen.flags &= ~ (Screen_Autowrap | Screen_WrapNext); 1612 screen.flags &= ~(Screen_Autowrap | Screen_WrapNext);
1478} 1613}
1479 1614
1480/* ------------------------------------------------------------------------- */ 1615/* ------------------------------------------------------------------------- */
1481/* 1616/*
1482 * Set/unset margin origin mode 1617 * Set/unset margin origin mode
… …
1486 * and the cursor cannot be moved outside. 1621 * and the cursor cannot be moved outside.
1487 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h 1622 * XTERM_SEQ: Set Absolute: ESC [ ? 6 h
1488 * XTERM_SEQ: Set Relative: ESC [ ? 6 l 1623 * XTERM_SEQ: Set Relative: ESC [ ? 6 l
1489 */ 1624 */
1490void 1625void
1491rxvt_term::scr_relative_origin (int mode) 1626rxvt_term::scr_relative_origin (int mode) NOTHROW
1492{ 1627{
1493 if (mode) 1628 if (mode)
1494 screen.flags |= Screen_Relative; 1629 screen.flags |= Screen_Relative;
1495 else 1630 else
1496 screen.flags &= ~Screen_Relative; 1631 screen.flags &= ~Screen_Relative;
1632
1497 scr_gotorc (0, 0, 0); 1633 scr_gotorc (0, 0, 0);
1498} 1634}
1499 1635
1500/* ------------------------------------------------------------------------- */ 1636/* ------------------------------------------------------------------------- */
1501/* 1637/*
1502 * Set insert/replace mode 1638 * Set insert/replace mode
1503 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h 1639 * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h
1504 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l 1640 * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l
1505 */ 1641 */
1506void 1642void
1507rxvt_term::scr_insert_mode (int mode) 1643rxvt_term::scr_insert_mode (int mode) NOTHROW
1508{ 1644{
1509 if (mode) 1645 if (mode)
1510 screen.flags |= Screen_Insert; 1646 screen.flags |= Screen_Insert;
1511 else 1647 else
1512 screen.flags &= ~Screen_Insert; 1648 screen.flags &= ~Screen_Insert;
… …
1518 * XTERM_SEQ: Set tab at current column : ESC H 1654 * XTERM_SEQ: Set tab at current column : ESC H
1519 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g 1655 * XTERM_SEQ: Clear tab at current column: ESC [ 0 g
1520 * XTERM_SEQ: Clear all tabs : ESC [ 3 g 1656 * XTERM_SEQ: Clear all tabs : ESC [ 3 g
1521 */ 1657 */
1522void 1658void
1523rxvt_term::scr_set_tab (int mode) 1659rxvt_term::scr_set_tab (int mode) NOTHROW
1524{ 1660{
1525 if (mode < 0) 1661 if (mode < 0)
1526 MEMSET (tabs, 0, TermWin.ncol * sizeof (char)); 1662 memset (tabs, 0, ncol);
1527 else if (screen.cur.col < TermWin.ncol) 1663 else if (screen.cur.col < ncol)
1528 tabs[screen.cur.col] = (mode ? 1 : 0); 1664 tabs [screen.cur.col] = !!mode;
1529} 1665}
1530 1666
1531/* ------------------------------------------------------------------------- */ 1667/* ------------------------------------------------------------------------- */
1532/* 1668/*
1533 * Set reverse/normal video 1669 * Set reverse/normal video
1534 * XTERM_SEQ: Reverse video: ESC [ ? 5 h 1670 * XTERM_SEQ: Reverse video: ESC [ ? 5 h
1535 * XTERM_SEQ: Normal video : ESC [ ? 5 l 1671 * XTERM_SEQ: Normal video : ESC [ ? 5 l
1536 */ 1672 */
1537void 1673void
1538rxvt_term::scr_rvideo_mode (int mode) 1674rxvt_term::scr_rvideo_mode (bool on) NOTHROW
1539{ 1675{
1540 XGCValues gcvalue; 1676 rvideo_mode = on;
1541 1677
1678#ifndef NO_BELL
1679 on ^= rvideo_bell;
1680#endif
1681
1542 if (rvideo != mode) 1682 if (rvideo_state != on)
1543 { 1683 {
1544 rvideo = mode; 1684 rvideo_state = on;
1545 SWAP_IT (PixColors[Color_fg], PixColors[Color_bg], rxvt_color); 1685
1546#if defined(XPM_BACKGROUND) 1686 ::swap (pix_colors[Color_fg], pix_colors[Color_bg]);
1687#ifdef HAVE_BG_PIXMAP
1547 if (bgPixmap.pixmap == None) 1688 if (bg_pixmap == None)
1548#endif 1689#endif
1549#if defined(TRANSPARENT) 1690 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 1691
1692 XGCValues gcvalue;
1555 gcvalue.foreground = PixColors[Color_fg]; 1693 gcvalue.foreground = pix_colors[Color_fg];
1556 gcvalue.background = PixColors[Color_bg]; 1694 gcvalue.background = pix_colors[Color_bg];
1557 XChangeGC (display->display, TermWin.gc, GCBackground | GCForeground, 1695 XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue);
1558 &gcvalue); 1696
1559 scr_clear (); 1697 scr_clear ();
1560 scr_touch (true); 1698 scr_touch (true);
1561 } 1699 }
1562} 1700}
1563 1701
… …
1565/* 1703/*
1566 * Report current cursor position 1704 * Report current cursor position
1567 * XTERM_SEQ: Report position: ESC [ 6 n 1705 * XTERM_SEQ: Report position: ESC [ 6 n
1568 */ 1706 */
1569void 1707void
1570rxvt_term::scr_report_position () 1708rxvt_term::scr_report_position () NOTHROW
1571{ 1709{
1572 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); 1710 tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1);
1573} 1711}
1574 1712
1575/* ------------------------------------------------------------------------- * 1713/* ------------------------------------------------------------------------- *
… …
1578 1716
1579/* 1717/*
1580 * Set font style 1718 * Set font style
1581 */ 1719 */
1582void 1720void
1583rxvt_term::set_font_style () 1721rxvt_term::set_font_style () NOTHROW
1584{ 1722{
1723#if 0
1585 switch (charsets[screen.charset]) 1724 switch (charsets [screen.charset])
1586 { 1725 {
1587 case '0': /* DEC Special Character & Line Drawing Set */ 1726 case '0': /* DEC Special Character & Line Drawing Set */
1588 break; 1727 break;
1589 case 'A': /* United Kingdom (UK) */ 1728 case 'A': /* United Kingdom (UK) */
1590 break; 1729 break;
… …
1597 case 'C': /* Finnish character set */ 1736 case 'C': /* Finnish character set */
1598 break; 1737 break;
1599 case 'K': /* German character set */ 1738 case 'K': /* German character set */
1600 break; 1739 break;
1601 } 1740 }
1741#endif
1602} 1742}
1603 1743
1604/* ------------------------------------------------------------------------- */ 1744/* ------------------------------------------------------------------------- */
1605/* 1745/*
1606 * Choose a font 1746 * Choose a font
… …
1608 * XTERM_SEQ: Invoke G1 character set: CTRL-N 1748 * XTERM_SEQ: Invoke G1 character set: CTRL-N
1609 * XTERM_SEQ: Invoke G2 character set: ESC N 1749 * XTERM_SEQ: Invoke G2 character set: ESC N
1610 * XTERM_SEQ: Invoke G3 character set: ESC O 1750 * XTERM_SEQ: Invoke G3 character set: ESC O
1611 */ 1751 */
1612void 1752void
1613rxvt_term::scr_charset_choose (int set) 1753rxvt_term::scr_charset_choose (int set) NOTHROW
1614 { 1754{
1615 screen.charset = set; 1755 screen.charset = set;
1616 set_font_style (); 1756 set_font_style ();
1617 } 1757}
1618 1758
1619/* ------------------------------------------------------------------------- */ 1759/* ------------------------------------------------------------------------- */
1620/* 1760/*
1621 * Set a font 1761 * Set a font
1622 * XTERM_SEQ: Set G0 character set: ESC ( <C> 1762 * XTERM_SEQ: Set G0 character set: ESC ( <C>
… …
1624 * XTERM_SEQ: Set G2 character set: ESC * <C> 1764 * XTERM_SEQ: Set G2 character set: ESC * <C>
1625 * XTERM_SEQ: Set G3 character set: ESC + <C> 1765 * XTERM_SEQ: Set G3 character set: ESC + <C>
1626 * See set_font_style for possible values for <C> 1766 * See set_font_style for possible values for <C>
1627 */ 1767 */
1628void 1768void
1629rxvt_term::scr_charset_set (int set, unsigned int ch) 1769rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW
1630 { 1770{
1631 charsets[set] = (unsigned char)ch; 1771 charsets[set] = (unsigned char)ch;
1632 set_font_style (); 1772 set_font_style ();
1633 } 1773}
1634 1774
1635 1775
1636/* ------------------------------------------------------------------------- * 1776/* ------------------------------------------------------------------------- *
1637 * MAJOR SCREEN MANIPULATION * 1777 * MAJOR SCREEN MANIPULATION *
1638 * ------------------------------------------------------------------------- */ 1778 * ------------------------------------------------------------------------- */
1639 1779
1640/* 1780/*
1641 * refresh matching text. 1781 * refresh matching text.
1642 */ 1782 */
1643bool 1783bool
1644rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) 1784rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW
1645{ 1785{
1646 bool found = false; 1786 bool found = false;
1647 1787
1648 for (int i = 0; i < TermWin.nrow; i++) 1788 for (int i = 0; i < nrow; i++)
1649 { 1789 {
1650 int col = 0;
1651 rend_t *drp = drawn_rend [i]; 1790 rend_t *drp = drawn_buf[i].r;
1652 1791
1653 for (; col < TermWin.ncol; col++, drp++) 1792 for (int col = 0; col < ncol; col++, drp++)
1654 if ((*drp & mask) == value) 1793 if ((*drp & mask) == value)
1655 { 1794 {
1656 found = true; 1795 found = true;
1657 *drp = ~value; 1796 *drp = ~value;
1658 } 1797 }
… …
1669 PART_END, 1808 PART_END,
1670 RC_COUNT 1809 RC_COUNT
1671}; 1810};
1672 1811
1673void 1812void
1674rxvt_term::scr_expose (int x, int y, int width, int height, bool refresh) 1813rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW
1675{ 1814{
1676 int i; 1815 int i;
1677 row_col_t rc[RC_COUNT]; 1816 row_col_t rc[RC_COUNT];
1678 1817
1679 if (drawn_text == NULL) /* sanity check */ 1818 if (!drawn_buf) /* sanity check */
1680 return; 1819 return;
1681 1820
1682#ifdef DEBUG_STRICT 1821#ifndef NO_SLOW_LINK_SUPPORT
1683 x = max (x, (int)TermWin.int_bwidth); 1822 if (refresh_type == FAST_REFRESH && !display->is_local)
1684 x = min (x, (int)TermWin.width); 1823 {
1685 y = max (y, (int)TermWin.int_bwidth); 1824 y = 0;
1686 y = min (y, (int)TermWin.height); 1825 eheight = height;
1826 }
1687#endif 1827#endif
1688 1828
1689 /* round down */ 1829 /* round down */
1690 rc[PART_BEG].col = Pixel2Col (x); 1830 rc[PART_BEG].col = Pixel2Col (x);
1691 rc[PART_BEG].row = Pixel2Row (y); 1831 rc[PART_BEG].row = Pixel2Row (y);
1692 /* round up */ 1832 /* round up */
1693 rc[PART_END].col = Pixel2Width (x + width + TermWin.fwidth - 1); 1833 rc[PART_END].col = Pixel2Width (x + ewidth + fwidth - 1);
1694 rc[PART_END].row = Pixel2Row (y + height + TermWin.fheight - 1); 1834 rc[PART_END].row = Pixel2Row (y + eheight + fheight - 1);
1695 1835
1696 /* sanity checks */ 1836 /* sanity checks */
1697 for (i = PART_BEG; i < RC_COUNT; i++) 1837 for (i = PART_BEG; i < RC_COUNT; i++)
1698 { 1838 {
1699 MIN_IT (rc[i].col, TermWin.ncol - 1); 1839 min_it (rc[i].col, ncol - 1);
1700 MIN_IT (rc[i].row, TermWin.nrow - 1); 1840 min_it (rc[i].row, nrow - 1);
1701 } 1841 }
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 1842
1705 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) 1843 for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++)
1706 fill_text (& (drawn_text[i][rc[PART_BEG].col]), 0, 1844 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)); 1845
1846 num_scr_allow = 0;
1708 1847
1709 if (refresh) 1848 if (refresh)
1710 scr_refresh (SLOW_REFRESH | REFRESH_BOUNDS); 1849 scr_refresh ();
1711} 1850}
1712 1851
1713/* ------------------------------------------------------------------------- */ 1852/* ------------------------------------------------------------------------- */
1714/* 1853/*
1715 * Refresh the entire screen 1854 * Refresh the entire screen
1716 */ 1855 */
1717void 1856void
1718rxvt_term::scr_touch (bool refresh) 1857rxvt_term::scr_touch (bool refresh) NOTHROW
1719{ 1858{
1720 scr_expose (0, 0, TermWin.width, TermWin.height, refresh); 1859 scr_expose (0, 0, width, height, refresh);
1721} 1860}
1722 1861
1723/* ------------------------------------------------------------------------- */ 1862/* ------------------------------------------------------------------------- */
1724/* 1863/*
1725 * Move the display so that the line represented by scrollbar value Y is at 1864 * Move the display so that the line represented by scrollbar value Y is at
1726 * the top of the screen 1865 * the top of the screen
1727 */ 1866 */
1728int 1867void
1729rxvt_term::scr_move_to (int y, int len) 1868rxvt_term::scr_move_to (int y, int len) NOTHROW
1730{ 1869{
1731 long p = 0; 1870 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} 1871}
1746 1872
1747/* ------------------------------------------------------------------------- */ 1873/* ------------------------------------------------------------------------- */
1748/* 1874/*
1749 * Page the screen up/down nlines 1875 * Page the screen up/down nlines
1750 * direction should be UP or DN 1876 * direction should be UP or DN
1751 */ 1877 */
1752int 1878bool
1753rxvt_term::scr_page (enum page_dirn direction, int nlines) 1879rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW
1754{ 1880{
1755 int n; 1881 int new_view_start =
1756 uint16_t oldviewstart; 1882 direction == UP ? view_start - nlines
1883 : view_start + nlines;
1757 1884
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); 1885 return scr_changeview (new_view_start);
1774} 1886}
1775 1887
1776int 1888bool
1777rxvt_term::scr_changeview (uint16_t oldviewstart) 1889rxvt_term::scr_changeview (int new_view_start) NOTHROW
1778{ 1890{
1891 clamp_it (new_view_start, top_row, 0);
1892
1779 if (TermWin.view_start != oldviewstart) 1893 if (new_view_start == view_start)
1780 { 1894 return false;
1895
1896 num_scr += new_view_start - view_start;
1897 view_start = new_view_start;
1781 want_refresh = 1; 1898 want_refresh = 1;
1782 num_scr -= (TermWin.view_start - oldviewstart);
1783 }
1784 return (int) (TermWin.view_start - oldviewstart);
1785}
1786 1899
1787/* ------------------------------------------------------------------------- */ 1900 HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END));
1788void 1901
1789rxvt_term::scr_bell () 1902 return true;
1790{ 1903}
1904
1791#ifndef NO_BELL 1905#ifndef NO_BELL
1906void
1907rxvt_term::bell_cb (ev::timer &w, int revents)
1908{
1909 rvideo_bell = false;
1910 scr_rvideo_mode (rvideo_mode);
1911 refresh_check ();
1912}
1913#endif
1914
1915/* ------------------------------------------------------------------------- */
1916void
1917rxvt_term::scr_bell () NOTHROW
1918{
1919#ifndef NO_BELL
1920
1792# ifndef NO_MAPALERT 1921# ifndef NO_MAPALERT
1793# ifdef MAPALERT_OPTION 1922# ifdef MAPALERT_OPTION
1794 if (Options & Opt_mapAlert) 1923 if (option (Opt_mapAlert))
1795# endif 1924# endif
1796 XMapWindow (display->display, TermWin.parent[0]); 1925 XMapWindow (dpy, parent[0]);
1797# endif 1926# endif
1927
1928# if ENABLE_FRILLS
1929 if (option (Opt_urgentOnBell))
1930 set_urgency (1);
1931# endif
1932
1798 if (Options & Opt_visualBell) 1933 if (option (Opt_visualBell))
1799 { 1934 {
1800 scr_rvideo_mode (!rvideo); /* refresh also done */ 1935 rvideo_bell = true;
1801 scr_rvideo_mode (!rvideo); /* refresh also done */ 1936 scr_rvideo_mode (rvideo_mode);
1937 flush ();
1938
1939 bell_ev.start (VISUAL_BELL_DURATION);
1802 } 1940 }
1803 else 1941 else
1804 XBell (display->display, 0); 1942 XBell (dpy, 0);
1943 HOOK_INVOKE ((this, HOOK_BELL, DT_END));
1805#endif 1944#endif
1806} 1945}
1807 1946
1808/* ------------------------------------------------------------------------- */ 1947/* ------------------------------------------------------------------------- */
1809/* ARGSUSED */ 1948/* ARGSUSED */
1810void 1949void
1811rxvt_term::scr_printscreen (int fullhist) 1950rxvt_term::scr_printscreen (int fullhist) NOTHROW
1812{ 1951{
1813#ifdef PRINTPIPE 1952#ifdef PRINTPIPE
1814 int i, r1, nrows, row_offset; 1953 int nrows, row_start;
1815 text_t *t; 1954 FILE *fd = popen_printer ();
1816 FILE *fd;
1817 1955
1818 if ((fd = popen_printer ()) == NULL) 1956 if (!fd)
1819 return; 1957 return;
1820 nrows = TermWin.nrow; 1958
1821 row_offset = TermWin.saveLines;
1822 if (!fullhist) 1959 if (fullhist)
1823 row_offset -= TermWin.view_start; 1960 {
1961 nrows = nrow - top_row;
1962 row_start = top_row;
1963 }
1824 else 1964 else
1825 { 1965 {
1826 nrows += TermWin.nscrolled; 1966 nrows = nrow;
1827 row_offset -= TermWin.nscrolled; 1967 row_start = view_start;
1828 }
1829
1830 for (r1 = 0; r1 < nrows; r1++)
1831 { 1968 }
1832 t = screen.text[r1 + row_offset]; 1969
1833 for (i = TermWin.ncol - 1; i >= 0; i--) 1970 wctomb (0, 0);
1834 if (!isspace (t[i])) 1971
1835 break; 1972 for (int r1 = row_start; r1 < row_start + nrows; r1++)
1836 fprintf (fd, "%.*s\n", (i + 1), t);
1837 } 1973 {
1974 text_t *tp = ROW(r1).t;
1975 int len = ROW(r1).l;
1976
1977 for (int i = len >= 0 ? len : ncol - 1; i--; ) //TODO//FIXME//LEN
1978 {
1979 char mb[MB_LEN_MAX];
1980 text_t t = *tp++;
1981 if (t == NOCHAR)
1982 continue;
1983
1984 len = wctomb (mb, t);
1985
1986 if (len <= 0)
1987 {
1988 mb[0] = ' ';
1989 len = 1;
1990 }
1991
1992 fwrite (mb, 1, len, fd);
1993 }
1994
1995 fputc ('\n', fd);
1996 }
1997
1838 pclose_printer (fd); 1998 pclose_printer (fd);
1839#endif 1999#endif
1840} 2000}
1841 2001
1842/* ------------------------------------------------------------------------- */ 2002/* ------------------------------------------------------------------------- */
1843/* 2003/*
1844 * Refresh the screen 2004 * Refresh the screen
1845 * drawn_text/drawn_rend contain the screen information before the update. 2005 * drawn_text/drawn_rend contain the screen information before the update.
1846 * screen.text/screen.rend contain what the screen will change to. 2006 * screen.text/screen.rend contain what the screen will change to.
1847 */ 2007 */
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 2008void
1859rxvt_term::scr_refresh (unsigned char refresh_type) 2009rxvt_term::scr_refresh () NOTHROW
1860{ 2010{
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 */ 2011 int16_t col, row, /* column/row we're processing */
1867 ocrow; /* old cursor row */ 2012 ocrow; /* old cursor row */
1868 int i, /* tmp */ 2013 int i; /* tmp */
1869 row_offset; /* basic offset in screen structure */
1870#ifndef NO_CURSORCOLOR 2014#ifndef NO_CURSORCOLOR
1871 rend_t cc1; /* store colours at cursor position (s) */ 2015 rend_t cc1; /* store colours at cursor position (s) */
1872#endif 2016#endif
1873 rend_t *drp, *srp; /* drawn-rend-pointer, screen-rend-pointer */ 2017 rend_t *crp; // cursor rendition pointer
1874 text_t *dtp, *stp; /* drawn-text-pointer, screen-text-pointer */ 2018 rend_t ccol1, /* Cursor colour */
2019 ccol2; /* Cursor colour2 */
1875 2020
2021 want_refresh = 0; /* screen is current */
2022
1876 if (refresh_type == NO_REFRESH || !TermWin.mapped) 2023 if (refresh_type == NO_REFRESH || !mapped)
1877 return; 2024 return;
1878 2025
1879 /* 2026 /*
1880 * A: set up vars 2027 * A: set up vars
1881 */ 2028 */
1882 clearfirst = clearlast = must_clear = 0;
1883
1884 refresh_count = 0; 2029 refresh_count = 0;
1885 2030
1886 row_offset = TermWin.saveLines - TermWin.view_start; 2031 unsigned int old_screen_flags = screen.flags;
1887 2032 char have_bg = 0;
1888 if ((refresh_type & REFRESH_BOUNDS)) 2033#ifdef HAVE_BG_PIXMAP
1889 { 2034 have_bg = bg_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 2035#endif
1900 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ 2036 ocrow = oldcursor.row; /* is there an old outline cursor on screen? */
1901 2037
1902 /* 2038 /*
1903 * B: reverse any characters which are selected 2039 * B: reverse any characters which are selected
1904 */ 2040 */
1905 scr_reverse_selection (); 2041 scr_reverse_selection ();
1906 2042
2043 HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END));
2044#if ENABLE_OVERLAY
2045 scr_swap_overlay ();
2046#endif
2047
2048 char showcursor = screen.flags & Screen_VisibleCursor;
2049
1907 /* 2050 /*
1908 * C: set the cursor character (s) 2051 * C: set the cursor character (s)
1909 */ 2052 */
1910 { 2053 {
1911 unsigned char setoldcursor; 2054 unsigned char setoldcursor;
1912 rend_t ccol1, /* Cursor colour */
1913 ccol2; /* Cursor colour2 */
1914 2055
1915 showcursor = (screen.flags & Screen_VisibleCursor);
1916#ifdef CURSOR_BLINK 2056#ifdef CURSOR_BLINK
1917 if (hidden_cursor) 2057 if (hidden_cursor)
1918 showcursor = 0; 2058 showcursor = 0;
1919#endif 2059#endif
1920 2060
1921 if (showcursor) 2061 if (showcursor)
1922 { 2062 {
1923 srp = & (screen.rend[screen.cur.row + TermWin.saveLines] 2063 int col = screen.cur.col;
1924 [screen.cur.col]);
1925 2064
1926 if (showcursor && TermWin.focus) 2065 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2066 col--;
2067
2068 crp = &ROW(screen.cur.row).r[col];
2069
2070#ifndef NO_CURSORCOLOR
2071 cc1 = *crp & (RS_fgMask | RS_bgMask);
2072 if (ISSET_PIXCOLOR (Color_cursor))
2073 ccol1 = Color_cursor;
2074 else
2075#endif
2076#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2077 ccol1 = fgcolor_of (rstyle);
2078#else
2079 ccol1 = Color_fg;
2080#endif
2081
2082#ifndef NO_CURSORCOLOR
2083 if (ISSET_PIXCOLOR (Color_cursor2))
2084 ccol2 = Color_cursor2;
2085 else
2086#endif
2087#ifdef CURSOR_COLOR_IS_RENDITION_COLOR
2088 ccol2 = bgcolor_of (rstyle);
2089#else
2090 ccol2 = Color_bg;
2091#endif
2092
2093 if (focus)
1927 { 2094 {
2095 if (option (Opt_cursorUnderline))
1928 *srp ^= RS_RVid; 2096 *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 2097 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 2098 {
1942#ifdef CURSOR_COLOR_IS_RENDITION_COLOR 2099 *crp ^= RS_RVid;
1943 ccol2 = GET_BGCOLOR (rstyle);
1944#else
1945 ccol2 = Color_bg;
1946#endif
1947 *srp = SET_FGCOLOR (*srp, ccol1); 2100 *crp = SET_FGCOLOR (*crp, ccol1);
1948 *srp = SET_BGCOLOR (*srp, ccol2); 2101 *crp = SET_BGCOLOR (*crp, ccol2);
1949#endif 2102 }
1950 } 2103 }
1951 } 2104 }
1952 2105
1953 /* make sure no outline cursor is left around */ 2106 /* make sure no outline cursor is left around */
1954 setoldcursor = 0; 2107 setoldcursor = 0;
1955 if (ocrow != -1) 2108 if (ocrow != -1)
1956 { 2109 {
1957 if (screen.cur.row + TermWin.view_start != ocrow 2110 if (screen.cur.row - view_start != ocrow
1958 || screen.cur.col != oldcursor.col) 2111 || screen.cur.col != oldcursor.col)
1959 { 2112 {
1960 if (ocrow < TermWin.nrow 2113 if (ocrow < nrow
1961 && oldcursor.col < TermWin.ncol) 2114 && oldcursor.col < ncol)
1962 {
1963 drawn_rend[ocrow][oldcursor.col] ^= (RS_RVid | RS_Uline); 2115 drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline);
1964 } 2116
1965 if (TermWin.focus || !showcursor) 2117 if (focus || !showcursor)
1966 oldcursor.row = -1; 2118 oldcursor.row = -1;
1967 else 2119 else
1968 setoldcursor = 1; 2120 setoldcursor = 1;
1969 } 2121 }
1970 } 2122 }
1971 else if (!TermWin.focus) 2123 else if (!focus)
1972 setoldcursor = 1; 2124 setoldcursor = 1;
2125
1973 if (setoldcursor) 2126 if (setoldcursor)
1974 { 2127 {
1975 if (screen.cur.row + TermWin.view_start >= TermWin.nrow) 2128 if (screen.cur.row - view_start >= nrow)
1976 oldcursor.row = -1; 2129 oldcursor.row = -1;
1977 else 2130 else
1978 { 2131 {
1979 oldcursor.row = screen.cur.row + TermWin.view_start; 2132 oldcursor.row = screen.cur.row - view_start;
1980 oldcursor.col = screen.cur.col; 2133 oldcursor.col = screen.cur.col;
1981 } 2134 }
1982 } 2135 }
1983 } 2136 }
1984 2137
1985#ifndef NO_SLOW_LINK_SUPPORT 2138#ifndef NO_SLOW_LINK_SUPPORT
1986 /* 2139 /*
1987 * D: CopyArea pass - very useful for slower links 2140 * D: CopyArea pass - very useful for slower links
1988 * This has been deliberately kept simple. 2141 * This has been deliberately kept simple.
1989 */ 2142 */
1990 i = num_scr; 2143 if (!display->is_local
1991 if (refresh_type == FAST_REFRESH && num_scr_allow && i 2144 && refresh_type == FAST_REFRESH && num_scr_allow && num_scr
1992 && abs (i) < TermWin.nrow && !must_clear) 2145 && abs (num_scr) < nrow && !have_bg)
1993 { 2146 {
1994 int16_t nits; 2147 int16_t nits;
1995 int j; 2148 int i = num_scr;
1996 rend_t *drp2; 2149 int j;
1997 text_t *dtp2;
1998 int len, wlen; 2150 int len, wlen;
2151 dLocal (int, num_scr);
1999 2152
2000 j = TermWin.nrow; 2153 j = nrow;
2001 wlen = len = -1; 2154 wlen = len = -1;
2002 row = i > 0 ? 0 : j - 1; 2155 row = i > 0 ? 0 : j - 1;
2156
2003 for (; j-- >= 0; row += (i > 0 ? 1 : -1)) 2157 for (; j-- >= 0; row += (i > 0 ? 1 : -1))
2004 { 2158 {
2005 if (row + i >= 0 && row + i < TermWin.nrow && row + i != ocrow) 2159 if (row + i >= 0 && row + i < nrow && row + i != ocrow)
2006 { 2160 {
2007 stp = screen.text[row + row_offset]; 2161 line_t s = ROW(view_start + row);
2008 srp = screen.rend[row + row_offset];
2009 dtp = drawn_text[row]; 2162 line_t d = drawn_buf[row];
2010 dtp2 = drawn_text[row + i]; 2163 line_t d2 = drawn_buf[row + i];
2011 drp = drawn_rend[row];
2012 drp2 = drawn_rend[row + i];
2013 2164
2014 for (nits = 0, col = TermWin.ncol; col--; ) 2165 for (nits = 0, col = ncol; col--; )
2015 if (stp[col] != dtp2[col] || srp[col] != drp2[col]) 2166 if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col])
2016 nits--; 2167 nits--;
2017 else if (stp[col] != dtp[col] || srp[col] != drp[col]) 2168 else if (s.t[col] != d.t[col] || s.r[col] != d.r[col])
2018 nits++; 2169 nits++;
2019 2170
2020 if (nits > 8) /* XXX: arbitrary choice */ 2171 if (nits > 8) /* XXX: arbitrary choice */
2021 { 2172 {
2022 for (col = TermWin.ncol; col--; ) 2173 for (col = ncol; col--; )
2023 { 2174 {
2024 *dtp++ = *dtp2++; 2175 *d.t++ = *d2.t++;
2025 *drp++ = *drp2++; 2176 *d.r++ = *d2.r++;
2026 } 2177 }
2027 2178
2028 if (len == -1) 2179 if (len == -1)
2029 len = row; 2180 len = row;
2030 2181
2031 wlen = row; 2182 wlen = row;
2032 continue; 2183 continue;
2033 } 2184 }
2034 } 2185 }
2035 2186
2036 if (len != -1) 2187 if (len >= 0)
2037 { 2188 {
2038 /* also comes here at end if needed because of >= above */ 2189 /* also comes here at end if needed because of >= above */
2039 if (wlen < len) 2190 if (wlen < len)
2040 SWAP_IT (wlen, len, int); 2191 ::swap (wlen, len);
2041 2192
2042 D_SCREEN ((stderr, "rxvt_scr_refresh (): XCopyArea: %d -> %d (height: %d)", len + i, len, wlen - len + 1)); 2193 XGCValues gcv;
2043 XCopyArea (display->display, TermWin.vt, TermWin.vt, 2194
2195 gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2196 XCopyArea (dpy, vt, vt,
2044 TermWin.gc, 0, Row2Pixel (len + i), 2197 gc, 0, Row2Pixel (len + i),
2045 (unsigned int)TermWin_TotalWidth (), 2198 (unsigned int)this->width,
2046 (unsigned int)Height2Pixel (wlen - len + 1), 2199 (unsigned int)Height2Pixel (wlen - len + 1),
2047 0, Row2Pixel (len)); 2200 0, Row2Pixel (len));
2201 gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv);
2202
2048 len = -1; 2203 len = -1;
2049 } 2204 }
2050 } 2205 }
2051 } 2206 }
2052#endif 2207#endif
2053 2208
2054 /* 2209 /*
2055 * E: main pass across every character 2210 * E: main pass across every character
2056 */ 2211 */
2057 for (row = 0; row < TermWin.nrow; row++) 2212 for (row = 0; row < nrow; row++)
2058 { 2213 {
2059 stp = screen.text[row + row_offset]; 2214 text_t *stp = ROW(view_start + row).t;
2060 srp = screen.rend[row + row_offset]; 2215 rend_t *srp = ROW(view_start + row).r;
2061 dtp = drawn_text[row]; 2216 text_t *dtp = drawn_buf[row].t;
2062 drp = drawn_rend[row]; 2217 rend_t *drp = drawn_buf[row].r;
2063 2218
2064 /* 2219 /*
2065 * E2: OK, now the real pass 2220 * E2: OK, now the real pass
2066 */ 2221 */
2067 int ypixel = (int)Row2Pixel (row); 2222 int ypixel = (int)Row2Pixel (row);
2068 2223
2069 for (col = 0; col < TermWin.ncol; col++) 2224 for (col = 0; col < ncol; col++)
2070 { 2225 {
2071 /* compare new text with old - if exactly the same then continue */ 2226 /* compare new text with old - if exactly the same then continue */
2072 if (stp[col] == dtp[col] /* Must match characters to skip. */ 2227 if (stp[col] == dtp[col] /* Must match characters to skip. */
2073 && (srp[col] == drp[col] /* Either rendition the same or */ 2228 && (RS_SAME (srp[col], drp[col]) /* Either rendition the same or */
2074 || (stp[col] == ' ' /* space w/ no background change */ 2229 || (stp[col] == ' ' /* space w/ no background change */
2075 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col])))) 2230 && GET_BGATTR (srp[col]) == GET_BGATTR (drp[col]))))
2076 continue; 2231 continue;
2077 2232
2078 // redraw one or more characters 2233 // redraw one or more characters
2079 2234
2080 // seek to the beginning if wide characters 2235 // seek to the beginning of wide characters
2081 while (stp[col] == NOCHAR && col > 0) 2236 while (expect_false (stp[col] == NOCHAR && col > 0))
2082 --col; 2237 --col;
2083 2238
2084 rend_t rend = srp[col]; /* screen rendition (target rendtion) */ 2239 rend_t rend = srp[col]; /* screen rendition (target rendition) */
2085 text_t *text = stp + col; 2240 text_t *text = stp + col;
2086 int count = 1; 2241 int count = 1;
2087 2242
2088 dtp[col] = stp[col]; 2243 dtp[col] = stp[col];
2089 drp[col] = rend; 2244 drp[col] = rend;
2090 2245
2091 int xpixel = Col2Pixel (col); 2246 int xpixel = Col2Pixel (col);
2092 2247
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; ) 2248 for (i = 0; ++col < ncol; )
2096 { 2249 {
2097 if (stp[col] == NOCHAR) 2250 if (stp[col] == NOCHAR)
2098 { 2251 {
2099 dtp[col] = stp[col]; 2252 dtp[col] = stp[col];
2100 drp[col] = rend; 2253 drp[col] = srp[col];
2254
2101 count++; 2255 count++;
2102
2103 if (i) // only possible skip if char unchanged
2104 i++; 2256 i++;
2105 2257
2106 continue; 2258 continue;
2107 } 2259 }
2108 2260
2109 if (rend != srp[col]) 2261 if (!RS_SAME (rend, srp[col]))
2110 break; 2262 break;
2111 2263
2112 count++; 2264 count++;
2113 2265
2114 if (stp[col] != dtp[col] 2266 if (stp[col] != dtp[col]
2115 || srp[col] != drp[col]) 2267 || !RS_SAME (srp[col], drp[col]))
2116 { 2268 {
2117 if (must_clear && (i++ > (count / 2))) 2269 if (have_bg && (i++ > count / 2))
2118 break; 2270 break;
2119 2271
2120 dtp[col] = stp[col]; 2272 dtp[col] = stp[col];
2121 drp[col] = rend; 2273 drp[col] = rend;
2122 i = 0; 2274 i = 0;
2123 } 2275 }
2124 else if (must_clear || (stp[col] != ' ' && ++i >= 32)) 2276 else if (have_bg || (stp[col] != ' ' && ++i >= 16))
2125 break; 2277 break;
2126 } 2278 }
2127 2279
2128 col--; /* went one too far. move back */ 2280 col--; /* went one too far. move back */
2129 count -= i; /* dump any matching trailing chars */ 2281 count -= i; /* dump any matching trailing chars */
2282
2283 // sometimes we optimize away the trailing NOCHAR's, add them back
2284 while (expect_false (i && text[count] == NOCHAR))
2285 count++, i--;
2130 2286
2131 /* 2287 /*
2132 * Determine the attributes for the string 2288 * Determine the attributes for the string
2133 */ 2289 */
2134 int fid = GET_FONT (rend);
2135 int fore = GET_FGCOLOR (rend); // desired foreground 2290 int fore = fgcolor_of (rend); // desired foreground
2136 int back = GET_BGCOLOR (rend); // desired background 2291 int back = bgcolor_of (rend); // desired background
2137 2292
2138 rend = GET_ATTR (rend); 2293 // only do special processing if any attributes are set, which is unlikely
2139 2294 if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel)))
2140 rvid = !!(rend & RS_RVid); 2295 {
2296 bool invert = rend & RS_RVid;
2141 2297
2142#ifndef NO_BOLD_UNDERLINE_REVERSE 2298#ifndef NO_BOLD_UNDERLINE_REVERSE
2143 if (rend & RS_Bold && fore == Color_fg) 2299 if (rend & RS_Bold && fore == Color_fg)
2144 { 2300 {
2145 if (ISSET_PIXCOLOR (Color_BD)) 2301 if (ISSET_PIXCOLOR (Color_BD))
2146 fore = Color_BD; 2302 fore = Color_BD;
2303# if !ENABLE_STYLES
2147 else 2304 else
2148 rvid = !rvid; 2305 invert = !invert;
2306# endif
2307 }
2308
2309 if (rend & RS_Italic && fore == Color_fg)
2310 {
2311 if (ISSET_PIXCOLOR (Color_IT))
2312 fore = Color_IT;
2313# if !ENABLE_STYLES
2314 else
2315 invert = !invert;
2316# endif
2317 }
2318
2319 if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL))
2320 fore = Color_UL;
2321#endif
2322
2323#ifdef OPTION_HC
2324 if (rend & RS_Sel)
2325 {
2326 /* invert the column if no highlightColor is set or it is the
2327 * current cursor column */
2328 if (!(showcursor && row == screen.cur.row && text - stp == screen.cur.col)
2329 && ISSET_PIXCOLOR (Color_HC))
2330 {
2331 if (ISSET_PIXCOLOR (Color_HTC))
2332 fore = Color_HTC;
2333 // if invert is 0 reverse video is set so we use bg color as fg color
2334 else if (!invert)
2335 fore = back;
2336
2337 back = Color_HC;
2338 invert = 0;
2339 }
2340 }
2341#endif
2342
2343 if (invert)
2344 {
2345 ::swap (fore, back);
2346
2347#ifndef NO_BOLD_UNDERLINE_REVERSE
2348 if (fore == back)
2349 {
2350 fore = Color_bg;
2351 back = Color_fg;
2352 }
2353#endif
2354 }
2355
2356#ifdef TEXT_BLINK
2357 if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
2358 {
2359 if (!text_blink_ev.is_active ())
2360 {
2361 text_blink_ev.again ();
2362 hidden_text = 0;
2363 }
2364 else if (hidden_text)
2365 fore = back;
2366 }
2367#endif
2368
2369#if ENABLE_STYLES
2370 // "careful" (too wide) character handling
2371
2372 // include previous careful character(s) if possible, looks nicer (best effort...)
2373 while (text > stp
2374 && srp[text - stp - 1] & RS_Careful
2375 && RS_SAME (rend, srp[text - stp - 1]))
2376 text--, count++, xpixel -= fwidth;
2377
2378 // force redraw after "careful" characters to avoid pixel droppings
2379 for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++)
2380 drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw;
2381
2382 // force redraw before "careful" characters to avoid pixel droppings
2383 for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++)
2384 drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw;
2385#endif
2149 } 2386 }
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 2387
2185 /* 2388 /*
2186 * Actually do the drawing of the string here 2389 * Actually do the drawing of the string here
2187 */ 2390 */
2188 rxvt_font *font = (*TermWin.fontset)[fid]; 2391 rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)];
2189 2392
2190 if (back == fore) 2393 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 { 2394 {
2196 if (must_clear) 2395 // this is very ugly, maybe push it into ->draw?
2197 {
2198 CLEAR_CHARS (xpixel, ypixel, count);
2199 2396
2200 for (i = 0; i < count; i++) /* don't draw empty strings */ 2397 for (i = 0; i < count; i++) /* don't draw empty strings */
2201 if (text[i] != ' ') 2398 if (text[i] != ' ')
2202 { 2399 {
2203 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, -1); 2400 font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent);
2204 break; 2401 goto did_clear;
2205 }
2206 } 2402 }
2207 else 2403
2208 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, Color_bg); 2404 CLEAR_CHARS (xpixel, ypixel, count);
2405 did_clear: ;
2209 } 2406 }
2210 else 2407 else
2211 font->draw (*TermWin.drawable, xpixel, ypixel, text, count, fore, back); 2408 font->draw (*drawable, xpixel, ypixel, text, count, fore, back);
2212 2409
2213 if ((rend & RS_Uline) && (font->descent > 1)) 2410 if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back))
2214 XDrawLine (display->display, drawBuffer, TermWin.gc, 2411 {
2412#if ENABLE_FRILLS
2413 if (ISSET_PIXCOLOR (Color_underline))
2414 XSetForeground (dpy, gc, pix_colors[Color_underline]);
2415 else
2416#endif
2417 XSetForeground (dpy, gc, pix_colors[fore]);
2418
2419 XDrawLine (dpy, vt, gc,
2215 xpixel, ypixel + font->ascent + 1, 2420 xpixel, ypixel + font->ascent + 1,
2216 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); 2421 xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1);
2422 }
2217 } /* for (col....) */ 2423 } /* for (col....) */
2218 } /* for (row....) */ 2424 } /* for (row....) */
2219 2425
2220 /* 2426 /*
2221 * G: cleanup cursor and display outline cursor if necessary 2427 * G: cleanup cursor and display outline cursor if necessary
2222 */ 2428 */
2223 if (showcursor) 2429 if (showcursor)
2224 { 2430 {
2225 if (TermWin.focus) 2431 if (focus)
2432 {
2433 if (option (Opt_cursorUnderline))
2434 *crp ^= RS_Uline;
2435 else
2226 { 2436 {
2227 srp = & (screen.rend[screen.cur.row + TermWin.saveLines]
2228 [screen.cur.col]);
2229 *srp ^= RS_RVid; 2437 *crp ^= RS_RVid;
2230#ifndef NO_CURSORCOLOR 2438#ifndef NO_CURSORCOLOR
2231 *srp = (*srp & ~ (RS_fgMask | RS_bgMask)) | cc1; 2439 *crp = (*crp & ~ (RS_fgMask | RS_bgMask)) | cc1;
2232#endif 2440#endif
2441 }
2233 } 2442 }
2234 else if (oldcursor.row >= 0) 2443 else if (oldcursor.row >= 0)
2235 { 2444 {
2445 int cursorwidth = 1;
2446 int col = oldcursor.col;
2447
2448 while (col && ROW(screen.cur.row).t[col] == NOCHAR)
2449 col--;
2450
2451 while (col + cursorwidth < ncol
2452 && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR)
2453 cursorwidth++;
2454
2236#ifndef NO_CURSORCOLOR 2455#ifndef NO_CURSORCOLOR
2237 if (ISSET_PIXCOLOR (Color_cursor)) 2456 if (ISSET_PIXCOLOR (Color_cursor))
2238 XSetForeground (display->display, TermWin.gc, PixColors[Color_cursor]); 2457 XSetForeground (dpy, gc, pix_colors[Color_cursor]);
2458 else
2239#endif 2459#endif
2240 int cursorwidth = 1; 2460 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 2461
2245 XDrawRectangle (display->display, drawBuffer, TermWin.gc, 2462 XDrawRectangle (dpy, vt, gc,
2246 Col2Pixel (oldcursor.col), 2463 Col2Pixel (col),
2247 Row2Pixel (oldcursor.row), 2464 Row2Pixel (oldcursor.row),
2248 (unsigned int) (Width2Pixel (cursorwidth) - 1), 2465 (unsigned int) (Width2Pixel (cursorwidth) - 1),
2249 (unsigned int) (Height2Pixel (1) - TermWin.lineSpace - 1)); 2466 (unsigned int) (Height2Pixel (1) - lineSpace - 1));
2250 } 2467 }
2251 } 2468 }
2252 2469
2253 /* 2470 /*
2254 * H: cleanup selection 2471 * H: cleanup selection
2255 */ 2472 */
2473#if ENABLE_OVERLAY
2474 scr_swap_overlay ();
2475#endif
2476 HOOK_INVOKE ((this, HOOK_REFRESH_END, DT_END));
2477
2256 scr_reverse_selection (); 2478 scr_reverse_selection ();
2257 2479
2258 /* 2480 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; 2481 num_scr = 0;
2284 num_scr_allow = 1; 2482 num_scr_allow = 1;
2285 want_refresh = 0; /* screen is current */
2286} 2483}
2287 2484
2288void 2485void
2289rxvt_term::scr_remap_chars (text_t *tp, rend_t *rp) 2486rxvt_term::scr_remap_chars (line_t &l) NOTHROW
2290{ 2487{
2291 if (!rp || !tp) 2488 if (!l.t)
2292 return; 2489 return;
2293 2490
2294 for (int i = TermWin.ncol; i; i--, rp++, tp++) 2491 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 2492
2493 for (int i = ncol; i--; )
2494 l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i]));
2495}
2496
2298void 2497void
2299rxvt_term::scr_remap_chars () 2498rxvt_term::scr_remap_chars () NOTHROW
2300{ 2499{
2301 for (int i = TermWin.nrow + TermWin.saveLines; i--; ) 2500 for (int i = total_rows; i--; )
2302 scr_remap_chars (screen.text[i], screen.rend[i]); 2501 scr_remap_chars (row_buf [i]);
2303 2502
2304 for (int i = TermWin.nrow; i--; ) 2503 for (int i = nrow; i--; )
2305 {
2306 scr_remap_chars (drawn_text[i], drawn_rend[i]);
2307 scr_remap_chars (swap.text[i], swap.rend[i]);
2308 } 2504 {
2505 scr_remap_chars (drawn_buf [i]);
2506 scr_remap_chars (swap_buf [i]);
2507 }
2309} 2508}
2310 2509
2311/* ------------------------------------------------------------------------- */
2312void 2510void
2511rxvt_term::scr_recolour (bool refresh) NOTHROW
2512{
2513 bool transparent = false;
2514
2515#ifdef HAVE_BG_PIXMAP
2516 if (bg_pixmap != None)
2517 {
2518# ifdef ENABLE_TRANSPARENCY
2519 if (bg_flags & BG_IS_TRANSPARENT)
2520 {
2521 XSetWindowBackgroundPixmap (dpy, parent[0], bg_pixmap);
2522 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2523
2524 transparent = true;
2525 }
2526 else
2527# endif
2528 {
2529 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2530 XSetWindowBackgroundPixmap (dpy, vt, bg_pixmap);
2531 }
2532 }
2533 else
2534#endif
2535 {
2536 XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]);
2537 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
2538 }
2539
2540 XClearWindow (dpy, parent[0]);
2541
2542 if (scrollBar.win)
2543 {
2544 if (transparent)
2545 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2546 else
2547 XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]);
2548 scrollBar.state = STATE_IDLE;
2549 scrollBar.show (0);
2550 }
2551
2552 if (refresh)
2553 {
2554 scr_clear ();
2555 scr_touch (true);
2556 }
2557 want_refresh = 1;
2558}
2559
2560/* ------------------------------------------------------------------------- */
2561void
2313rxvt_term::scr_clear (bool really) 2562rxvt_term::scr_clear (bool really) NOTHROW
2314{ 2563{
2315 if (!TermWin.mapped) 2564 if (!mapped)
2316 return; 2565 return;
2317 2566
2318 num_scr_allow = 0; 2567 num_scr_allow = 0;
2319 want_refresh = 1; 2568 want_refresh = 1;
2320 2569
2321#ifdef TRANSPARENT 2570 if (really)
2322 if ((Options & Opt_transparent) && (am_pixmap_trans == 0)) 2571 XClearWindow (dpy, vt);
2572}
2573
2574void
2575rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW
2576{
2577 int view_end = view_start + nrow;
2578 int row, col;
2579
2580 for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++)
2581 {
2582 text_t *stp = ROW(row).t;
2583 rend_t *srp = ROW(row).r;
2584
2585 for (col = beg_col; col < end_col; col++)
2586 srp[col] ^= rstyle1;
2587
2588 while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col])))
2589 srp[col] ^= rstyle2;
2590
2591 if (++col < end_col)
2592 srp[col] ^= rstyle2;
2323 { 2593 }
2324 int i; 2594}
2325 2595
2326 if (! (Options & Opt_transparent_all)) 2596void
2597rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW
2598{
2599 int view_end = view_start + nrow;
2600 int row, col;
2601
2602 if (beg_row >= view_start)
2603 {
2604 col = beg_col;
2605 row = beg_row;
2606 }
2607 else
2608 {
2327 i = 0; 2609 col = 0;
2610 row = view_start;
2611 }
2612
2613 for (; row < min (end_row, view_end); row++, col = 0)
2614 for (rend_t *srp = ROW(row).r; col < ncol; col++)
2615 srp[col] ^= rstyle;
2616
2617 if (row == end_row)
2618 for (rend_t *srp = ROW(row).r; col < end_col; col++)
2619 srp[col] ^= rstyle;
2620}
2621
2622/* ------------------------------------------------------------------------- */
2623void
2624rxvt_term::scr_reverse_selection () NOTHROW
2625{
2626 if (selection.op
2627 && current_screen == selection.screen
2628 && selection.end.row >= view_start)
2629 {
2630#if !ENABLE_MINIMAL
2631 if (selection.rect)
2632 scr_xor_rect (selection.beg.row, selection.beg.col,
2633 selection.end.row, selection.end.col,
2634 RS_Sel | RS_RVid, RS_Sel | RS_RVid | RS_Uline);
2328 else 2635 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 2636#endif
2336 2637 scr_xor_span (selection.beg.row, selection.beg.col,
2337 if (really) 2638 selection.end.row, selection.end.col,
2338 XClearWindow (display->display, TermWin.vt); 2639 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 } 2640 }
2369} 2641}
2370 2642
2371/* ------------------------------------------------------------------------- */ 2643/* ------------------------------------------------------------------------- */
2372/* 2644/*
2373 * Dump the whole scrollback and screen to the passed filedescriptor. The 2645 * Dump the whole scrollback and screen to the passed filedescriptor. The
2374 * invoking routine must close the fd. 2646 * invoking routine must close the fd.
2375 */ 2647 */
2376#if 0 2648#if 0
2377void 2649void
2378rxvt_term::scr_dump (int fd) 2650rxvt_term::scr_dump (int fd) NOTHROW
2379{ 2651{
2380 int row, wrote; 2652 int row, wrote;
2381 unsigned int width, towrite; 2653 unsigned int width, towrite;
2382 char r1[] = "\n"; 2654 const char r1[] = "\n";
2383 2655
2384 for (row = TermWin.saveLines - TermWin.nscrolled; 2656 for (row = saveLines + top_row;
2385 row < TermWin.saveLines + TermWin.nrow - 1; row++) 2657 row < saveLines + nrow - 1; row++)
2386 { 2658 {
2387 width = screen.tlen[row] >= 0 ? screen.tlen[row] 2659 width = row_buf[row].l >= 0 ? row_buf[row].l
2388 : TermWin.ncol; 2660 : ncol;
2389 for (towrite = width; towrite; towrite -= wrote) 2661 for (towrite = width; towrite; towrite -= wrote)
2390 { 2662 {
2391 wrote = write (fd, & (screen.text[row][width - towrite]), 2663 wrote = write (fd, & (row_buf[row].t[width - towrite]),
2392 towrite); 2664 towrite);
2393 if (wrote < 0) 2665 if (wrote < 0)
2394 return; /* XXX: death, no report */ 2666 return; /* XXX: death, no report */
2395 } 2667 }
2396 if (screen.tlen[row] >= 0) 2668 if (row_buf[row].l >= 0)
2397 if (write (fd, r1, 1) <= 0) 2669 if (write (fd, r1, 1) <= 0)
2398 return; /* XXX: death, no report */ 2670 return; /* XXX: death, no report */
2399 } 2671 }
2400} 2672}
2401#endif 2673#endif
2402 2674
2403/* ------------------------------------------------------------------------- * 2675/* ------------------------------------------------------------------------- *
2404 * CHARACTER SELECTION * 2676 * CHARACTER SELECTION *
2405 * ------------------------------------------------------------------------- */ 2677 * ------------------------------------------------------------------------- */
2406
2407/*
2408 * -TermWin.nscrolled <= (selection row) <= TermWin.nrow - 1
2409 */
2410void 2678void
2411rxvt_term::selection_check (int check_more) 2679rxvt_term::selection_check (int check_more) NOTHROW
2412{ 2680{
2413 row_col_t pos; 2681 row_col_t pos;
2414 2682
2415 if (!selection.op) 2683 if (!selection.op)
2416 return; 2684 return;
2417 2685
2418 pos.row = pos.col = 0; 2686 pos.row = pos.col = 0;
2419 if ((selection.beg.row < - (int32_t)TermWin.nscrolled) 2687 if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow)
2420 || (selection.beg.row >= TermWin.nrow) 2688 || !IN_RANGE_EXC (selection.mark.row, top_row, nrow)
2421 || (selection.mark.row < - (int32_t)TermWin.nscrolled) 2689 || !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 2690 || (check_more == 1
2426 && current_screen == selection.screen 2691 && current_screen == selection.screen
2427 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) 2692 && !ROWCOL_IS_BEFORE (screen.cur, selection.beg)
2428 && ROWCOL_IS_BEFORE (screen.cur, selection.end)) 2693 && ROWCOL_IS_BEFORE (screen.cur, selection.end))
2429 || (check_more == 2 2694 || (check_more == 2
… …
2431 && ROWCOL_IS_AFTER (selection.end, pos)) 2696 && ROWCOL_IS_AFTER (selection.end, pos))
2432 || (check_more == 3 2697 || (check_more == 3
2433 && ROWCOL_IS_AFTER (selection.end, pos)) 2698 && ROWCOL_IS_AFTER (selection.end, pos))
2434 || (check_more == 4 /* screen width change */ 2699 || (check_more == 4 /* screen width change */
2435 && (selection.beg.row != selection.end.row 2700 && (selection.beg.row != selection.end.row
2436 || selection.end.col > TermWin.ncol))) 2701 || selection.end.col > ncol)))
2437 CLEAR_SELECTION (); 2702 CLEAR_SELECTION ();
2438} 2703}
2439 2704
2440/* ------------------------------------------------------------------------- */ 2705/* ------------------------------------------------------------------------- */
2441/* 2706/*
2442 * Paste a selection direct to the command fd 2707 * Paste a selection direct to the command fd
2443 */ 2708 */
2444void 2709void
2445rxvt_term::paste (const unsigned char *data, unsigned int len) 2710rxvt_term::tt_paste (char *data, unsigned int len) NOTHROW
2446{ 2711{
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 */ 2712 /* convert normal newline chars into common keyboard Return key sequence */
2456 for (i = 0; i < len; i += PROP_SIZE) 2713 for (unsigned int i = 0; i < len; i++)
2457 { 2714 if (data[i] == C0_LF)
2458 n = min (len - i, PROP_SIZE); 2715 data[i] = C0_CR;
2459 MEMCPY (ds, data + i, n);
2460 2716
2461 for (j = 0; j < n; j++) 2717 if (priv_modes & PrivMode_BracketPaste)
2462 if (ds[j] == '\n') 2718 tt_printf ("\e[200~");
2463 ds[j] = '\r';
2464 2719
2465 tt_write (ds, (int)n); 2720 tt_write (data, len);
2466 }
2467 2721
2468 free (ds); 2722 if (priv_modes & PrivMode_BracketPaste)
2723 tt_printf ("\e[201~");
2469} 2724}
2470 2725
2471/* ------------------------------------------------------------------------- */
2472/*
2473 * Respond to a notification that a primary selection has been sent
2474 * EXT: SelectionNotify
2475 */
2476int
2477rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop)
2478{
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 */
2486 {
2487 if ((selection_type & Sel_CompoundText))
2488 {
2489 int selnum = selection_type & Sel_whereMask;
2490
2491 selection_type = 0;
2492 if (selnum != Sel_direct)
2493 selection_request_other (XA_STRING, selnum);
2494 }
2495
2496 if ((selection_type & Sel_UTF8String))
2497 {
2498 int selnum = selection_type & Sel_whereMask;
2499
2500 selection_type = Sel_CompoundText;
2501 if (selnum != Sel_direct)
2502 selection_request_other (xa[XA_COMPOUND_TEXT], selnum);
2503 else
2504 selection_type = 0;
2505 }
2506
2507 return 0;
2508 }
2509
2510 for (;;)
2511 {
2512 if (XGetWindowProperty (display->display, win, prop, (long) (nread / 4),
2513 (long) (PROP_SIZE / 4), delete_prop,
2514 AnyPropertyType, &ct.encoding, &ct.format,
2515 &ct.nitems, &bytes_after,
2516 &ct.value) != Success)
2517 break;
2518
2519 if (ct.encoding == 0)
2520 {
2521 D_SELECT ((stderr, "rxvt_selection_paste: property didn't exist!"));
2522 break;
2523 }
2524
2525 if (ct.value == NULL)
2526 {
2527 D_SELECT ((stderr, "rxvt_selection_paste: property shooting blanks!"));
2528 continue;
2529 }
2530
2531 if (ct.nitems == 0)
2532 {
2533 D_SELECT ((stderr, "rxvt_selection_paste: property empty - also INCR end"));
2534 if (selection_wait == Sel_normal && nread == 0
2535 && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
2536 {
2537 /*
2538 * pass through again trying CUT_BUFFER0 if we've come from
2539 * XConvertSelection () but nothing was presented
2540 */
2541 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0"));
2542 selection_paste (display->root, XA_CUT_BUFFER0, False);
2543 }
2544
2545 nread = -1; /* discount any previous stuff */
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 {
2556 for (int i = 0; i < cr; i++)
2557 paste ((unsigned char *)cl[i], STRLEN (cl[i]));
2558
2559 XFreeStringList (cl);
2560 }
2561 else
2562 paste (ct.value, ct.nitems);
2563
2564 if (bytes_after == 0)
2565 break;
2566
2567 XFree (ct.value);
2568 }
2569
2570 if (ct.value)
2571 XFree (ct.value);
2572
2573 if (selection_wait == Sel_normal)
2574 selection_wait = Sel_none;
2575
2576 D_SELECT ((stderr, "rxvt_selection_paste: bytes written: %ld", nread));
2577 return (int)nread;
2578}
2579
2580void 2726void
2581rxvt_term::incr_cb (time_watcher &w) 2727rxvt_term::paste (char *data, unsigned int len) NOTHROW
2582{ 2728{
2583 selection_wait = Sel_none; 2729 if (HOOK_INVOKE ((this, HOOK_TT_PASTE, DT_STR_LEN, data, len, DT_END)))
2584
2585 rxvt_print_error ("data loss: timeout on INCR selection paste");
2586}
2587
2588/*
2589 * INCR support originally provided by Paul Sheer <psheer@obsidian.co.za>
2590 */
2591void
2592rxvt_term::selection_property (Window win, Atom prop)
2593{
2594 int reget_time = 0;
2595
2596 if (prop == None)
2597 return; 2730 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 2731
2606 a = XGetWindowProperty (display->display, win, prop, 0L, 1L, False, 2732 tt_paste (data, len);
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)
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} 2733}
2734
2638/* ------------------------------------------------------------------------- */ 2735/* ------------------------------------------------------------------------- */
2639/* 2736/*
2640 * Request the current selection: 2737 * Request the current selection:
2641 * Order: > internal selection if available 2738 * Order: > internal selection if available
2642 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) 2739 * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
2643 * > CUT_BUFFER0 2740 * > CUT_BUFFER0
2644 * (+) if ownership is claimed but property is empty, rxvt_selection_paste () 2741 * (+) if ownership is claimed but property is empty, rxvt_selection_paste ()
2645 * will auto fallback to CUT_BUFFER0 2742 * will auto fallback to CUT_BUFFER0
2646 * EXT: button 2 release 2743 * EXT: button 2 release
2647 */ 2744 */
2648void 2745void
2649rxvt_term::selection_request (Time tm, int x, int y) 2746rxvt_term::selection_request (Time tm, int selnum) NOTHROW
2650{ 2747{
2651 D_SELECT ((stderr, "rxvt_selection_request (%lu, %d, %d)", tm, x, y)); 2748 if (selection.text && selnum == Sel_Primary)
2652 if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) 2749 {
2653 return; /* outside window */
2654
2655 if (selection.text != NULL)
2656 { /* internal selection */ 2750 /* internal selection */
2657 D_SELECT ((stderr, "rxvt_selection_request: pasting internal"));
2658 paste (selection.text, selection.len); 2751 char *str = rxvt_wcstombs (selection.text, selection.len);
2659 return; 2752 paste (str, strlen (str));
2660 } 2753 free (str);
2661 else
2662 { 2754 }
2663 int i; 2755 else if (!selection_req)
2664
2665 selection_request_time = tm;
2666 selection_wait = Sel_normal;
2667 for (i = Sel_Primary; i <= Sel_Clipboard; i++)
2668 {
2669#if X_HAVE_UTF8_STRING
2670 selection_type = Sel_UTF8String;
2671 if (selection_request_other (xa[XA_UTF8_STRING], i))
2672 return;
2673#else
2674 selection_type = Sel_CompoundText;
2675 if (selection_request_other (xa[XA_COMPOUND_TEXT], i))
2676 return;
2677#endif
2678
2679 }
2680 } 2756 {
2681 selection_wait = Sel_none; /* don't loop in rxvt_selection_paste () */ 2757 selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this);
2682 D_SELECT ((stderr, "rxvt_selection_request: pasting CUT_BUFFER0")); 2758 selection_req->run ();
2683 selection_paste (display->root, XA_CUT_BUFFER0, False);
2684}
2685
2686int
2687rxvt_term::selection_request_other (Atom target, int selnum)
2688{
2689 Atom sel;
2690#ifdef DEBUG_SELECT
2691 char *debug_xa_names[] = { "PRIMARY", "SECONDARY", "CLIPBOARD" };
2692#endif
2693
2694 selection_type |= selnum;
2695 if (selnum == Sel_Primary)
2696 sel = XA_PRIMARY;
2697 else if (selnum == Sel_Secondary)
2698 sel = XA_SECONDARY;
2699 else
2700 sel = xa[XA_CLIPBOARD];
2701 if (XGetSelectionOwner (display->display, sel) != None)
2702 { 2759 }
2703 D_SELECT ((stderr, "rxvt_selection_request_other: pasting %s", debug_xa_names[selnum]));
2704 XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION],
2705 TermWin.vt, selection_request_time);
2706 return 1;
2707 }
2708 return 0;
2709} 2760}
2710 2761
2711/* ------------------------------------------------------------------------- */ 2762/* ------------------------------------------------------------------------- */
2712/* 2763/*
2713 * Clear all selected text 2764 * Clear all selected text
2714 * EXT: SelectionClear 2765 * EXT: SelectionClear
2715 */ 2766 */
2716void 2767void
2717rxvt_term::selection_clear () 2768rxvt_term::selection_clear (bool clipboard) NOTHROW
2718{ 2769{
2719 D_SELECT ((stderr, "rxvt_selection_clear ()")); 2770 if (!clipboard)
2720 2771 {
2721 want_refresh = 1; 2772 want_refresh = 1;
2722 free (selection.text); 2773 free (selection.text);
2723 selection.text = NULL; 2774 selection.text = NULL;
2724 selection.len = 0; 2775 selection.len = 0;
2725 CLEAR_SELECTION (); 2776 CLEAR_SELECTION ();
2777
2778 if (display->selection_owner == this)
2779 display->selection_owner = 0;
2780 }
2781 else
2782 {
2783 free (selection.clip_text);
2784 selection.clip_text = NULL;
2785 selection.clip_len = 0;
2786
2787 if (display->clipboard_owner == this)
2788 display->clipboard_owner = 0;
2789 }
2726} 2790}
2727 2791
2728/* ------------------------------------------------------------------------- */ 2792/* ------------------------------------------------------------------------- */
2729/* 2793/*
2730 * Copy a selection into the cut buffer 2794 * Copy a selection into the cut buffer
2731 * EXT: button 1 or 3 release 2795 * EXT: button 1 or 3 release
2732 */ 2796 */
2733void 2797void
2734rxvt_term::selection_make (Time tm) 2798rxvt_term::selection_make (Time tm)
2735{ 2799{
2736 int i, col, end_col, row, end_row; 2800 int size;
2737 unsigned char *new_selection_text; 2801 wchar_t *new_selection_text;
2738 char *str;
2739 text_t *t; 2802 text_t *t;
2740 2803
2741 D_SELECT ((stderr, "rxvt_selection_make (): selection.op=%d, selection.clicks=%d", selection.op, selection.clicks));
2742 switch (selection.op) 2804 switch (selection.op)
2743 { 2805 {
2744 case SELECTION_CONT: 2806 case SELECTION_CONT:
2745 break; 2807 break;
2746 case SELECTION_INIT: 2808 case SELECTION_INIT:
… …
2756 selection.op = SELECTION_DONE; 2818 selection.op = SELECTION_DONE;
2757 2819
2758 if (selection.clicks == 4) 2820 if (selection.clicks == 4)
2759 return; /* nothing selected, go away */ 2821 return; /* nothing selected, go away */
2760 2822
2823 if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END)))
2824 return;
2825
2761 i = (selection.end.row - selection.beg.row + 1) * (TermWin.ncol + 1) + 1; 2826 size = (selection.end.row - selection.beg.row + 1) * (ncol + 1);
2762 str = (char *)rxvt_malloc ((i + 2) * MB_CUR_MAX + 1); 2827 new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t));
2763 2828
2764 new_selection_text = (unsigned char *)str; 2829 int ofs = 0;
2830 int extra = 0;
2765 2831
2766 col = selection.beg.col; 2832 int col = selection.beg.col;
2767 MAX_IT (col, 0); 2833 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 2834
2835 int end_col;
2836
2772 for (; row <= end_row; row++, col = 0) 2837 for (; row <= selection.end.row; row++, col = 0)
2773 { 2838 {
2774 t = & (screen.text[row][col]); 2839#if !ENABLE_MINIMAL
2775 2840 if (selection.rect)
2776 end_col = screen.tlen[row]; 2841 {
2777 2842 col = selection.beg.col;
2778 if (end_col == -1)
2779 end_col = TermWin.ncol; 2843 end_col = selection.end.col;
2844 }
2845 else
2846#endif
2847 end_col = ROW(row).l;
2780 2848
2849 col = max (col, 0);
2850
2781 if (row == end_row) 2851 if (row == selection.end.row)
2782 MIN_IT (end_col, selection.end.col); 2852 min_it (end_col, selection.end.col);
2853
2854 t = ROW(row).t + col;
2783 2855
2784 for (; col < end_col; col++) 2856 for (; col < end_col; col++)
2857 {
2785 if (*t == NOCHAR) 2858 if (*t == NOCHAR)
2786 t++; 2859 t++;
2860#if ENABLE_COMBINING
2861 else if (IS_COMPOSE (*t))
2862 {
2863 int len = rxvt_composite.expand (*t, 0);
2864
2865 extra -= (len - 1);
2866
2867 if (extra < 0)
2868 {
2869 extra += size;
2870 size += size;
2871 new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t));
2872 }
2873
2874 ofs += rxvt_composite.expand (*t++, new_selection_text + ofs);
2875 }
2876#endif
2787 else 2877 else
2788 { 2878 new_selection_text[ofs++] = *t++;
2789 int len = wcrtomb (str, *t++, mbs);
2790 if (len > 0)
2791 str += len;
2792 } 2879 }
2793 2880
2794 if (screen.tlen[row] != -1 && row != end_row) 2881#if !ENABLE_MINIMAL
2795 *str++ = '\n'; 2882 if (selection.rect)
2796 } 2883 {
2884 while (ofs
2885 && new_selection_text[ofs - 1] != C0_LF
2886 && unicode::is_space (new_selection_text[ofs - 1]))
2887 --ofs;
2797 2888
2798#ifndef NO_OLD_SELECTION 2889 new_selection_text[ofs++] = C0_LF;
2799 if (selection_style == OLD_SELECT) 2890 }
2800 if (end_col == TermWin.ncol) 2891 else
2801 *str++ = '\n';
2802#endif 2892#endif
2803#ifndef NO_NEW_SELECTION 2893 if (!ROW(row).is_longer ()
2804 if (selection_style != OLD_SELECT) 2894 && (row != selection.end.row || end_col != selection.end.col)
2805 if (end_col != selection.end.col) 2895 && (row != selection.beg.row || selection.beg.col < ncol))
2806 *str++ = '\n'; 2896 new_selection_text[ofs++] = C0_LF;
2807#endif 2897 }
2808 *str = '\0';
2809 2898
2810 i = str - (char *)new_selection_text; 2899 new_selection_text[ofs] = 0;
2900
2811 if (i == 0) 2901 if (ofs == 0)
2812 { 2902 {
2813 free (new_selection_text); 2903 free (new_selection_text);
2814 return; 2904 return;
2815 } 2905 }
2816 2906
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); 2907 free (selection.text);
2825 2908
2826 selection.text = new_selection_text; 2909 // we usually allocate much more than necessary, so realloc it smaller again
2910 selection.len = ofs;
2911 selection.text = (wchar_t *)rxvt_realloc (new_selection_text, (ofs + 1) * sizeof (wchar_t));
2827 2912
2828 XSetSelectionOwner (display->display, XA_PRIMARY, TermWin.vt, tm); 2913 if (HOOK_INVOKE ((this, HOOK_SEL_GRAB, DT_LONG, (long)tm, DT_END)))
2829 if (XGetSelectionOwner (display->display, XA_PRIMARY) == TermWin.vt) 2914 return;
2830 display->set_selection_owner (this); 2915
2916 selection_grab (tm);
2917}
2918
2919bool
2920rxvt_term::selection_grab (Time tm, bool clipboard) NOTHROW
2921{
2922 Atom sel;
2923
2924 if (!clipboard)
2925 {
2926 selection_time = tm;
2927 sel = XA_PRIMARY;
2928 }
2831 else 2929 else
2832 rxvt_print_error ("can't get primary selection");
2833
2834 { 2930 {
2931 clipboard_time = tm;
2932 sel = xa[XA_CLIPBOARD];
2933 }
2934
2935 XSetSelectionOwner (dpy, sel, vt, tm);
2936 if (XGetSelectionOwner (dpy, sel) == vt)
2937 {
2938 display->set_selection_owner (this, clipboard);
2939 return true;
2940 }
2941 else
2942 {
2943 selection_clear (clipboard);
2944 return false;
2945 }
2946
2947#if 0
2835 XTextProperty ct; 2948 XTextProperty ct;
2836 char *cl = (char *)selection.text;
2837 2949
2838 if (XmbTextListToTextProperty (display->display, &cl, 1, XStringStyle, &ct) >= 0) 2950 if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0)
2839 { 2951 {
2840 XChangeProperty (display->display, display->root, XA_CUT_BUFFER0, XA_STRING, 8, 2952 set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems);
2841 PropModeReplace, ct.value, ct.nitems);
2842 XFree (ct.value); 2953 XFree (ct.value);
2843 } 2954 }
2844 else 2955#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} 2956}
2852 2957
2853/* ------------------------------------------------------------------------- */ 2958/* ------------------------------------------------------------------------- */
2854/* 2959/*
2855 * Mark or select text based upon number of clicks: 1, 2, or 3 2960 * Mark or select text based upon number of clicks: 1, 2, or 3
2856 * EXT: button 1 press 2961 * EXT: button 1 press
2857 */ 2962 */
2858void 2963void
2859rxvt_term::selection_click (int clicks, int x, int y) 2964rxvt_term::selection_click (int clicks, int x, int y) NOTHROW
2860{ 2965{
2861 D_SELECT ((stderr, "rxvt_selection_click (%d, %d, %d)", clicks, x, y));
2862
2863 clicks = ((clicks - 1) % 3) + 1; 2966 clicks = ((clicks - 1) % 3) + 1;
2864 selection.clicks = clicks; /* save clicks so extend will work */ 2967 selection.clicks = clicks; /* save clicks so extend will work */
2865 2968
2969 if (clicks == 2 && !selection.rect
2970 && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END)))
2971 {
2972 MEvent.clicks = 1; // what a mess
2973 selection.screen = current_screen;
2974 selection.op = SELECTION_CONT;
2975 return;
2976 }
2977
2866 selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); 2978 selection_start_colrow (Pixel2Col (x), Pixel2Row (y));
2867 2979
2868 if (clicks == 2 || clicks == 3) 2980 if (clicks == 2 || clicks == 3)
2869 selection_extend_colrow (selection.mark.col, 2981 selection_extend_colrow (selection.mark.col,
2870 selection.mark.row + TermWin.view_start, 2982 selection.mark.row - view_start,
2871 0, /* button 3 */ 2983 0, /* button 3 */
2872 1, /* button press */ 2984 1, /* button press */
2873 0); /* click change */ 2985 0); /* click change */
2874} 2986}
2875 2987
2876/* ------------------------------------------------------------------------- */ 2988/* ------------------------------------------------------------------------- */
2877/* 2989/*
2878 * Mark a selection at the specified col/row 2990 * Mark a selection at the specified col/row
2879 */ 2991 */
2880void 2992void
2881rxvt_term::selection_start_colrow (int col, int row) 2993rxvt_term::selection_start_colrow (int col, int row) NOTHROW
2882{ 2994{
2883 want_refresh = 1; 2995 want_refresh = 1;
2996
2997 selection.mark.row = row + view_start;
2884 selection.mark.col = col; 2998 selection.mark.col = col;
2885 selection.mark.row = row - TermWin.view_start; 2999
2886 MAX_IT (selection.mark.row, - (int32_t)TermWin.nscrolled); 3000 selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1);
2887 MIN_IT (selection.mark.row, (int32_t)TermWin.nrow - 1); 3001 selection.mark.col = clamp (selection.mark.col, 0, ncol - 1);
3002
2888 MAX_IT (selection.mark.col, 0); 3003 while (selection.mark.col > 0
2889 MIN_IT (selection.mark.col, (int32_t)TermWin.ncol - 1); 3004 && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
3005 --selection.mark.col;
2890 3006
2891 if (selection.op) 3007 if (selection.op)
3008 {
2892 { /* clear the old selection */ 3009 /* clear the old selection */
2893 selection.beg.row = selection.end.row = selection.mark.row; 3010 selection.beg.row = selection.end.row = selection.mark.row;
2894 selection.beg.col = selection.end.col = selection.mark.col; 3011 selection.beg.col = selection.end.col = selection.mark.col;
2895 } 3012 }
3013
2896 selection.op = SELECTION_INIT; 3014 selection.op = SELECTION_INIT;
2897 selection.screen = current_screen; 3015 selection.screen = current_screen;
2898} 3016}
2899 3017
2900/* ------------------------------------------------------------------------- */ 3018/* ------------------------------------------------------------------------- */
… …
2902 * Word select: select text for 2 clicks 3020 * Word select: select text for 2 clicks
2903 * We now only find out the boundary in one direction 3021 * We now only find out the boundary in one direction
2904 */ 3022 */
2905 3023
2906/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ 3024/* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */
2907#define DELIMIT_TEXT(x) \ 3025#define DELIMIT_TEXT(x) \
2908 (((x) == ' ' || (x) == '\t') ? 2 : (STRCHR (rs[Rs_cutchars], (x)) != NULL)) 3026 (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x)))
2909#define DELIMIT_REND(x) 1 3027#define DELIMIT_REND(x) 1
2910 3028
2911void 3029void
2912rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) 3030rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW
2913{ 3031{
2914 int col, row, dirnadd, tcol, trow, w1, w2; 3032 int col, row, dirnadd, tcol, trow, w1, w2;
2915 row_col_t bound; 3033 row_col_t bound;
2916 text_t *stp; 3034 text_t *stp;
2917 rend_t *srp; 3035 rend_t *srp;
2918 3036
2919 if (dirn == UP) 3037 if (dirn == UP)
2920 { 3038 {
2921 bound.row = TermWin.saveLines - TermWin.nscrolled - 1; 3039 bound.row = top_row - 1;
2922 bound.col = 0; 3040 bound.col = 0;
2923 dirnadd = -1; 3041 dirnadd = -1;
2924 } 3042 }
2925 else 3043 else
2926 { 3044 {
2927 bound.row = TermWin.saveLines + TermWin.nrow; 3045 bound.row = nrow;
2928 bound.col = TermWin.ncol - 1; 3046 bound.col = ncol - 1;
2929 dirnadd = 1; 3047 dirnadd = 1;
2930 } 3048 }
2931 row = mark->row + TermWin.saveLines; 3049
3050 row = mark->row;
2932 col = mark->col; 3051 col = max (mark->col, 0);
2933 MAX_IT (col, 0); 3052
2934 /* find the edge of a word */ 3053 /* find the edge of a word */
2935 stp = & (screen.text[row][col]); 3054 stp = ROW(row).t + col; w1 = DELIMIT_TEXT (*stp);
2936 w1 = DELIMIT_TEXT (*stp); 3055 srp = ROW(row).r + col; w2 = DELIMIT_REND (*srp);
2937 3056
2938 if (selection_style != NEW_SELECT) 3057 for (;;)
2939 { 3058 {
2940 if (w1 == 1) 3059 for (; col != bound.col; col += dirnadd)
2941 { 3060 {
2942 stp += dirnadd; 3061 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; 3062 srp += dirnadd;
3063
3064 if (*stp == NOCHAR)
3065 continue;
3066
2957 if (DELIMIT_TEXT (*stp) != w1) 3067 if (DELIMIT_TEXT (*stp) != w1)
2958 break; 3068 break;
2959 srp += dirnadd;
2960 if (DELIMIT_REND (*srp) != w2) 3069 if (DELIMIT_REND (*srp) != w2)
2961 break; 3070 break;
2962 } 3071 }
3072
2963 if ((col == bound.col) && (row != bound.row)) 3073 if ((col == bound.col) && (row != bound.row))
2964 { 3074 {
2965 if (screen.tlen[ (row - (dirn == UP ? 1 : 0))] == -1) 3075 if (ROW(row - (dirn == UP ? 1 : 0)).is_longer ())
2966 { 3076 {
2967 trow = row + dirnadd; 3077 trow = row + dirnadd;
2968 tcol = dirn == UP ? TermWin.ncol - 1 : 0; 3078 tcol = dirn == UP ? ncol - 1 : 0;
2969 if (screen.text[trow] == NULL) 3079
3080 if (!ROW(trow).t)
2970 break; 3081 break;
2971 stp = & (screen.text[trow][tcol]); 3082
2972 srp = & (screen.rend[trow][tcol]); 3083 stp = ROW(trow).t + tcol;
3084 srp = ROW(trow).r + tcol;
3085
2973 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2) 3086 if (DELIMIT_TEXT (*stp) != w1 || DELIMIT_REND (*srp) != w2)
2974 break; 3087 break;
3088
2975 row = trow; 3089 row = trow;
2976 col = tcol; 3090 col = tcol;
2977 continue; 3091 continue;
2978 } 3092 }
2979 } 3093 }
2980 break; 3094 break;
2981 } 3095 }
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 3096
2985 if (dirn == DN) 3097 if (dirn == DN)
2986 col++; /* put us on one past the end */ 3098 col++; /* put us on one past the end */
2987 3099
2988 /* Poke the values back in */ 3100 /* Poke the values back in */
2989 ret->row = row - TermWin.saveLines; 3101 ret->row = row;
2990 ret->col = col; 3102 ret->col = col;
2991} 3103}
2992 3104
2993/* ------------------------------------------------------------------------- */ 3105/* ------------------------------------------------------------------------- */
2994/* 3106/*
… …
2997 * flag == 0 ==> button 1 3109 * flag == 0 ==> button 1
2998 * flag == 1 ==> button 3 press 3110 * flag == 1 ==> button 3 press
2999 * flag == 2 ==> button 3 motion 3111 * flag == 2 ==> button 3 motion
3000 */ 3112 */
3001void 3113void
3002rxvt_term::selection_extend (int x, int y, int flag) 3114rxvt_term::selection_extend (int x, int y, int flag) NOTHROW
3003{ 3115{
3004 int col, row; 3116 int col = clamp (Pixel2Col (x), 0, ncol);
3117 int row = clamp (Pixel2Row (y), 0, nrow - 1);
3005 3118
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 /* 3119 /*
3015 * If we're selecting characters (single click) then we must check first 3120 * 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 3121 * 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 3122 * 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. 3123 * be _past_ a character for it to be selected.
3019 */ 3124 */
3020 if (selection_style != OLD_SELECT)
3021 {
3022 if (((selection.clicks % 3) == 1) && !flag 3125 if (((selection.clicks % 3) == 1) && !flag
3023 && (col == selection.mark.col 3126 && (col == selection.mark.col
3024 && (row == selection.mark.row + TermWin.view_start))) 3127 && (row == selection.mark.row - view_start)))
3025 { 3128 {
3026 /* select nothing */ 3129 /* select nothing */
3027 selection.beg.row = selection.end.row = 0; 3130 selection.beg.row = selection.end.row = 0;
3028 selection.beg.col = selection.end.col = 0; 3131 selection.beg.col = selection.end.col = 0;
3029 selection.clicks = 4; 3132 selection.clicks = 4;
3030 want_refresh = 1; 3133 want_refresh = 1;
3031 D_SELECT ((stderr, "rxvt_selection_extend () selection.clicks = 4"));
3032 return; 3134 return;
3033 }
3034 } 3135 }
3035#endif 3136
3036 if (selection.clicks == 4) 3137 if (selection.clicks == 4)
3037 selection.clicks = 1; 3138 selection.clicks = 1;
3038 3139
3039 selection_extend_colrow (col, row, !!flag, /* ? button 3 */ 3140 selection_extend_colrow (col, row, !!flag, /* ? button 3 */
3040 flag == 1 ? 1 : 0, /* ? button press */ 3141 flag == 1 ? 1 : 0, /* ? button press */
… …
3044/* ------------------------------------------------------------------------- */ 3145/* ------------------------------------------------------------------------- */
3045/* 3146/*
3046 * Extend the selection to the specified col/row 3147 * Extend the selection to the specified col/row
3047 */ 3148 */
3048void 3149void
3049rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) 3150rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW
3050{ 3151{
3051 int16_t ncol = TermWin.ncol;
3052 int end_col;
3053 row_col_t pos; 3152 row_col_t pos;
3054 enum { 3153 enum {
3055 LEFT, RIGHT 3154 LEFT, RIGHT
3056 } closeto = RIGHT; 3155 } closeto = RIGHT;
3057 3156
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; 3157 want_refresh = 1;
3158
3062 switch (selection.op) 3159 switch (selection.op)
3063 { 3160 {
3064 case SELECTION_INIT: 3161 case SELECTION_INIT:
3065 CLEAR_SELECTION (); 3162 CLEAR_SELECTION ();
3066 selection.op = SELECTION_BEGIN; 3163 selection.op = SELECTION_BEGIN;
… …
3079 selection_start_colrow (col, row); 3176 selection_start_colrow (col, row);
3080 /* FALLTHROUGH */ 3177 /* FALLTHROUGH */
3081 default: 3178 default:
3082 return; 3179 return;
3083 } 3180 }
3181
3084 if (selection.beg.col == selection.end.col 3182 if (selection.beg.col == selection.end.col
3085 && selection.beg.col != selection.mark.col 3183 && selection.beg.col != selection.mark.col
3086 && selection.beg.row == selection.end.row 3184 && selection.beg.row == selection.end.row
3087 && selection.beg.row != selection.mark.row) 3185 && selection.beg.row != selection.mark.row)
3088 { 3186 {
3089 selection.beg.col = selection.end.col = selection.mark.col; 3187 selection.beg.col = selection.end.col = selection.mark.col;
3090 selection.beg.row = selection.end.row = selection.mark.row; 3188 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 } 3189 }
3093 3190
3094 pos.col = col; 3191 pos.col = col;
3095 pos.row = row; 3192 pos.row = view_start + row;
3096 3193
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 /* 3194 /*
3161 * This is mainly xterm style selection with a couple of differences, mainly 3195 * This is mainly xterm style selection with a couple of differences, mainly
3162 * in the way button3 drag extension works. 3196 * in the way button3 drag extension works.
3163 * We're either doing: button1 drag; button3 press; or button3 drag 3197 * 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 3198 * 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 3203 * 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 3204 * and it was decided by whichever point/word/line was `fixed' at the
3171 * time of the most recent button3 press 3205 * time of the most recent button3 press
3172 */ 3206 */
3173 if (button3 && buttonpress) 3207 if (button3 && buttonpress)
3208 {
3174 { /* button3 press */ 3209 /* button3 press */
3175 /* 3210 /*
3176 * first determine which edge of the selection we are closest to 3211 * first determine which edge of the selection we are closest to
3177 */ 3212 */
3178 if (ROWCOL_IS_BEFORE (pos, selection.beg) 3213 if (ROWCOL_IS_BEFORE (pos, selection.beg)
3179 || (!ROWCOL_IS_AFTER (pos, selection.end) 3214 || (!ROWCOL_IS_AFTER (pos, selection.end)
3180 && (((pos.col - selection.beg.col) 3215 && (((pos.col - selection.beg.col)
3181 + ((pos.row - selection.beg.row) * ncol)) 3216 + ((pos.row - selection.beg.row) * ncol))
3182 < ((selection.end.col - pos.col) 3217 < ((selection.end.col - pos.col)
3183 + ((selection.end.row - pos.row) * ncol))))) 3218 + ((selection.end.row - pos.row) * ncol)))))
3184 closeto = LEFT; 3219 closeto = LEFT;
3220
3185 if (closeto == LEFT) 3221 if (closeto == LEFT)
3186 { 3222 {
3187 selection.beg.row = pos.row; 3223 selection.beg.row = pos.row;
3188 selection.beg.col = pos.col; 3224 selection.beg.col = pos.col;
3189 selection.mark.row = selection.end.row; 3225 selection.mark.row = selection.end.row;
3190 selection.mark.col = selection.end.col 3226 selection.mark.col = selection.end.col - (selection.clicks == 2);
3191 - (selection.clicks == 2);
3192 } 3227 }
3193 else 3228 else
3194 { 3229 {
3195 selection.end.row = pos.row; 3230 selection.end.row = pos.row;
3196 selection.end.col = pos.col; 3231 selection.end.col = pos.col;
3197 selection.mark.row = selection.beg.row; 3232 selection.mark.row = selection.beg.row;
3198 selection.mark.col = selection.beg.col; 3233 selection.mark.col = selection.beg.col;
3199 } 3234 }
3200 } 3235 }
3201 else 3236 else
3237 {
3202 { /* button1 drag or button3 drag */ 3238 /* button1 drag or button3 drag */
3203 if (ROWCOL_IS_AFTER (selection.mark, pos)) 3239 if (ROWCOL_IS_AFTER (selection.mark, pos))
3204 { 3240 {
3205 if ((selection.mark.row == selection.end.row) 3241 if (selection.mark.row == selection.end.row
3206 && (selection.mark.col == selection.end.col) 3242 && selection.mark.col == selection.end.col
3243 && clickchange
3207 && clickchange && selection.clicks == 2) 3244 && selection.clicks == 2)
3208 selection.mark.col--; 3245 selection.mark.col--;
3246
3209 selection.beg.row = pos.row; 3247 selection.beg.row = pos.row;
3210 selection.beg.col = pos.col; 3248 selection.beg.col = pos.col;
3211 selection.end.row = selection.mark.row; 3249 selection.end.row = selection.mark.row;
3212 selection.end.col = selection.mark.col 3250 selection.end.col = selection.mark.col + (selection.clicks == 2);
3213 + (selection.clicks == 2);
3214 } 3251 }
3215 else 3252 else
3216 { 3253 {
3217 selection.beg.row = selection.mark.row; 3254 selection.beg.row = selection.mark.row;
3218 selection.beg.col = selection.mark.col; 3255 selection.beg.col = selection.mark.col;
… …
3221 } 3258 }
3222 } 3259 }
3223 3260
3224 if (selection.clicks == 1) 3261 if (selection.clicks == 1)
3225 { 3262 {
3226 end_col = screen.tlen[selection.beg.row + TermWin.saveLines]; 3263 if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN
3227 if (end_col != -1 && selection.beg.col > end_col) 3264 && !ROW(selection.beg.row).is_longer ()
3265#if !ENABLE_MINIMAL
3266 && !selection.rect
3267#endif
3228 { 3268 )
3229#if 1
3230 selection.beg.col = ncol; 3269 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 3270
3271 if (
3272 selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN
3273 && !ROW(selection.end.row).is_longer ()
3274#if !ENABLE_MINIMAL
3275 && !selection.rect
3276#endif
3238 } 3277 )
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; 3278 selection.end.col = ncol;
3242
3243 } 3279 }
3244 else if (selection.clicks == 2) 3280 else if (selection.clicks == 2)
3245 { 3281 {
3246 if (ROWCOL_IS_AFTER (selection.end, selection.beg)) 3282 if (ROWCOL_IS_AFTER (selection.end, selection.beg))
3247 selection.end.col--; 3283 selection.end.col--;
3284
3248 selection_delimit_word (UP, & (selection.beg), 3285 selection_delimit_word (UP, &selection.beg, &selection.beg);
3249 & (selection.beg));
3250 selection_delimit_word (DN, & (selection.end), 3286 selection_delimit_word (DN, &selection.end, &selection.end);
3251 & (selection.end));
3252 } 3287 }
3253 else if (selection.clicks == 3) 3288 else if (selection.clicks == 3)
3254 { 3289 {
3255#ifndef NO_FRILLS 3290#if ENABLE_FRILLS
3256 if ((Options & Opt_tripleclickwords)) 3291 if (option (Opt_tripleclickwords))
3257 { 3292 {
3258 int end_row;
3259
3260 selection_delimit_word (UP, & (selection.beg), 3293 selection_delimit_word (UP, &selection.beg, &selection.beg);
3261 & (selection.beg)); 3294
3262 end_row = screen.tlen[selection.mark.row
3263 + TermWin.saveLines];
3264 for (end_row = selection.mark.row; end_row < TermWin.nrow; 3295 for (int end_row = selection.mark.row; end_row < nrow; end_row++)
3265 end_row++)
3266 { 3296 {
3267 end_col = screen.tlen[end_row + TermWin.saveLines]; 3297 if (!ROW(end_row).is_longer ())
3268 if (end_col != -1)
3269 { 3298 {
3270 selection.end.row = end_row; 3299 selection.end.row = end_row;
3271 selection.end.col = end_col; 3300 selection.end.col = ROW(end_row).l;
3301# if !ENABLE_MINIMAL
3272 selection_remove_trailing_spaces (); 3302 selection_remove_trailing_spaces ();
3303# endif
3273 break; 3304 break;
3274 } 3305 }
3275 } 3306 }
3276 } 3307 }
3277 else 3308 else
3278#endif 3309#endif
3279
3280 { 3310 {
3281 if (ROWCOL_IS_AFTER (selection.mark, selection.beg)) 3311 if (ROWCOL_IS_AFTER (selection.mark, selection.beg))
3282 selection.mark.col++; 3312 selection.mark.col++;
3313
3283 selection.beg.col = 0; 3314 selection.beg.col = 0;
3284 selection.end.col = ncol; 3315 selection.end.col = ncol;
3316
3317 // select a complete logical line
3318 while (selection.beg.row > -saveLines
3319 && ROW(selection.beg.row - 1).is_longer ())
3320 selection.beg.row--;
3321
3322 while (selection.end.row < nrow
3323 && ROW(selection.end.row).is_longer ())
3324 selection.end.row++;
3285 } 3325 }
3286 } 3326 }
3327
3287 if (button3 && buttonpress) 3328 if (button3 && buttonpress)
3329 {
3288 { /* mark may need to be changed */ 3330 /* mark may need to be changed */
3289 if (closeto == LEFT) 3331 if (closeto == LEFT)
3290 { 3332 {
3291 selection.mark.row = selection.end.row; 3333 selection.mark.row = selection.end.row;
3292 selection.mark.col = selection.end.col 3334 selection.mark.col = selection.end.col - (selection.clicks == 2);
3293 - (selection.clicks == 2);
3294 } 3335 }
3295 else 3336 else
3296 { 3337 {
3297 selection.mark.row = selection.beg.row; 3338 selection.mark.row = selection.beg.row;
3298 selection.mark.col = selection.beg.col; 3339 selection.mark.col = selection.beg.col;
3299 } 3340 }
3300 } 3341 }
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 3342
3305#ifndef NO_FRILLS 3343#if !ENABLE_MINIMAL
3344 if (selection.rect && selection.beg.col > selection.end.col)
3345 ::swap (selection.beg.col, selection.end.col);
3346#endif
3347}
3348
3349#if !ENABLE_MINIMAL
3306void 3350void
3307rxvt_term::selection_remove_trailing_spaces () 3351rxvt_term::selection_remove_trailing_spaces () NOTHROW
3308{ 3352{
3309 int32_t end_col, end_row; 3353 int32_t end_col, end_row;
3310 text_t *stp; 3354 text_t *stp;
3311 3355
3312 end_col = selection.end.col; 3356 end_col = selection.end.col;
3313 end_row = selection.end.row; 3357 end_row = selection.end.row;
3358
3314 for ( ; end_row >= selection.beg.row; ) 3359 for (; end_row >= selection.beg.row; )
3315 { 3360 {
3316 stp = screen.text[end_row + TermWin.saveLines]; 3361 stp = ROW(end_row).t;
3362
3317 while (--end_col >= 0) 3363 while (--end_col >= 0)
3318 { 3364 {
3319 if (stp[end_col] != ' ' && stp[end_col] != '\t') 3365 if (stp[end_col] != NOCHAR
3366 && !unicode::is_space (stp[end_col]))
3320 break; 3367 break;
3321 } 3368 }
3369
3322 if (end_col >= 0 3370 if (end_col >= 0
3323 || screen.tlen[end_row - 1 + TermWin.saveLines] != -1) 3371 || !ROW(end_row - 1).is_longer ())
3324 { 3372 {
3325 selection.end.col = end_col + 1; 3373 selection.end.col = end_col + 1;
3326 selection.end.row = end_row; 3374 selection.end.row = end_row;
3327 break; 3375 break;
3328 } 3376 }
3377
3329 end_row--; 3378 end_row--;
3330 end_col = TermWin.ncol; 3379 end_col = ncol;
3331 } 3380 }
3381
3332 if (selection.mark.row > selection.end.row) 3382 if (selection.mark.row > selection.end.row)
3333 { 3383 {
3334 selection.mark.row = selection.end.row; 3384 selection.mark.row = selection.end.row;
3335 selection.mark.col = selection.end.col; 3385 selection.mark.col = selection.end.col;
3336 } 3386 }
… …
3344/* 3394/*
3345 * Double click on button 3 when already selected 3395 * Double click on button 3 when already selected
3346 * EXT: button 3 double click 3396 * EXT: button 3 double click
3347 */ 3397 */
3348void 3398void
3349rxvt_term::selection_rotate (int x, int y) 3399rxvt_term::selection_rotate (int x, int y) NOTHROW
3350{ 3400{
3351 selection.clicks = selection.clicks % 3 + 1; 3401 selection.clicks = selection.clicks % 3 + 1;
3352 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); 3402 selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1);
3353} 3403}
3354 3404
3355/* ------------------------------------------------------------------------- */ 3405/* ------------------------------------------------------------------------- */
3356/* 3406/*
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 3407 * Respond to a request for our current selection
3366 * EXT: SelectionRequest 3408 * EXT: SelectionRequest
3367 */ 3409 */
3368void 3410void
3369rxvt_term::selection_send (const XSelectionRequestEvent &rq) 3411rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW
3370{ 3412{
3371 XSelectionEvent ev; 3413 XSelectionEvent ev;
3372 XTextProperty ct;
3373 XICCEncodingStyle style;
3374 Atom target;
3375 3414
3376 ev.type = SelectionNotify; 3415 ev.type = SelectionNotify;
3377 ev.property = None; 3416 ev.property = None;
3378 ev.display = rq.display; 3417 ev.display = rq.display;
3379 ev.requestor = rq.requestor; 3418 ev.requestor = rq.requestor;
… …
3381 ev.target = rq.target; 3420 ev.target = rq.target;
3382 ev.time = rq.time; 3421 ev.time = rq.time;
3383 3422
3384 if (rq.target == xa[XA_TARGETS]) 3423 if (rq.target == xa[XA_TARGETS])
3385 { 3424 {
3386 Atom32 target_list[5]; 3425 Atom target_list[6];
3387 Atom32 *target = target_list; 3426 Atom *target = target_list;
3388 3427
3389 *target++ = (Atom32) xa[XA_TARGETS]; 3428 *target++ = xa[XA_TARGETS];
3429 *target++ = xa[XA_TIMESTAMP];
3390 *target++ = (Atom32) XA_STRING; 3430 *target++ = XA_STRING;
3391 *target++ = (Atom32) xa[XA_TEXT]; 3431 *target++ = xa[XA_TEXT];
3392 *target++ = (Atom32) xa[XA_COMPOUND_TEXT]; 3432 *target++ = xa[XA_COMPOUND_TEXT];
3393#if X_HAVE_UTF8_STRING 3433#if X_HAVE_UTF8_STRING
3394 *target++ = (Atom32) xa[XA_UTF8_STRING]; 3434 *target++ = xa[XA_UTF8_STRING];
3395#endif 3435#endif
3436
3396 XChangeProperty (display->display, rq.requestor, rq.property, XA_ATOM, 3437 XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM,
3397 (8 * sizeof (target_list[0])), PropModeReplace, 3438 32, PropModeReplace,
3398 (unsigned char *)target_list, 3439 (unsigned char *)target_list, target - target_list);
3399 target - target_list);
3400 ev.property = rq.property; 3440 ev.property = rq.property;
3401 } 3441 }
3442#if TODO // TODO
3402 else if (rq.target == xa[XA_MULTIPLE]) 3443 else if (rq.target == xa[XA_MULTIPLE])
3403 { 3444 {
3404 /* TODO: Handle MULTIPLE */ 3445 /* TODO: Handle MULTIPLE */
3405 } 3446 }
3447#endif
3406 else if (rq.target == xa[XA_TIMESTAMP] && selection.text) 3448 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text)
3407 { 3449 {
3408 XChangeProperty (display->display, rq.requestor, rq.property, XA_INTEGER, 3450 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3409 (8 * sizeof (Time)), PropModeReplace,
3410 (unsigned char *)&selection_time, 1); 3451 32, PropModeReplace, (unsigned char *)&selection_time, 1);
3452 ev.property = rq.property;
3453 }
3454 else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3455 {
3456 XChangeProperty (dpy, rq.requestor, rq.property, rq.target,
3457 32, PropModeReplace, (unsigned char *)&clipboard_time, 1);
3411 ev.property = rq.property; 3458 ev.property = rq.property;
3412 } 3459 }
3413 else if (rq.target == XA_STRING 3460 else if (rq.target == XA_STRING
3414 || rq.target == xa[XA_TEXT] 3461 || rq.target == xa[XA_TEXT]
3415 || rq.target == xa[XA_COMPOUND_TEXT] 3462 || rq.target == xa[XA_COMPOUND_TEXT]
3416 || rq.target == xa[XA_UTF8_STRING] 3463 || rq.target == xa[XA_UTF8_STRING]
3417 ) 3464 )
3418 { 3465 {
3466 XTextProperty ct;
3467 Atom target = rq.target;
3419 short freect = 0; 3468 short freect = 0;
3420 int selectlen; 3469 int selectlen;
3421 char *cl; 3470 wchar_t *cl;
3422 3471 enum {
3423 target = rq.target; 3472 enc_string = XStringStyle,
3473 enc_text = XStdICCTextStyle,
3474 enc_compound_text = XCompoundTextStyle,
3475#ifdef X_HAVE_UTF8_STRING
3476 enc_utf8 = XUTF8StringStyle,
3477#else
3478 enc_utf8 = -1,
3479#endif
3480 } style;
3424 3481
3425 if (target == XA_STRING) 3482 if (target == XA_STRING)
3426 // we actually don't do XA_STRING, but who cares, as i18n clients 3483 // we actually don't do XA_STRING, but who cares, as i18n clients
3427 // will ask for another format anyways. 3484 // will ask for another format anyways.
3428 style = XStringStyle; 3485 style = enc_string;
3429 else if (target == xa[XA_TEXT]) 3486 else if (target == xa[XA_TEXT])
3430 style = XTextStyle; 3487 style = enc_text;
3431 else if (target == xa[XA_COMPOUND_TEXT]) 3488 else if (target == xa[XA_COMPOUND_TEXT])
3432 style = XCompoundTextStyle; 3489 style = enc_compound_text;
3433#if X_HAVE_UTF8_STRING 3490#if !ENABLE_MINIMAL
3434 else if (target == xa[XA_UTF8_STRING]) 3491 else if (target == xa[XA_UTF8_STRING])
3435 style = XUTF8StringStyle; 3492 style = enc_utf8;
3436#endif 3493#endif
3437 else 3494 else
3438 { 3495 {
3439 target = xa[XA_COMPOUND_TEXT]; 3496 target = xa[XA_COMPOUND_TEXT];
3440 style = XCompoundTextStyle; 3497 style = enc_compound_text;
3441 }
3442
3443 if (selection.text)
3444 { 3498 }
3499
3500 if (rq.selection == XA_PRIMARY && selection.text)
3501 {
3445 cl = (char *)selection.text; 3502 cl = selection.text;
3446 selectlen = selection.len; 3503 selectlen = selection.len;
3447 } 3504 }
3505 else if (rq.selection == xa[XA_CLIPBOARD] && selection.clip_text)
3506 {
3507 cl = selection.clip_text;
3508 selectlen = selection.clip_len;
3509 }
3448 else 3510 else
3449 { 3511 {
3450 cl = ""; 3512 cl = L"";
3451 selectlen = 0; 3513 selectlen = 0;
3452 } 3514 }
3453 3515
3516#if !ENABLE_MINIMAL
3517 // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it
3518 // so recode it manually
3519 if (style == enc_utf8)
3520 {
3521 freect = 1;
3522 ct.encoding = target;
3523 ct.format = 8;
3524 ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen);
3525 ct.nitems = strlen ((char *)ct.value);
3526 }
3527 else
3528#endif
3454 if (XmbTextListToTextProperty (display->display, &cl, 1, style, &ct) >= 0) 3529 if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0)
3455 freect = 1; 3530 freect = 1;
3456 else 3531 else
3457 { 3532 {
3458 /* if we failed to convert then send it raw */ 3533 /* if we failed to convert then send it raw */
3459 ct.value = (unsigned char *)cl; 3534 ct.value = (unsigned char *)cl;
3460 ct.nitems = selectlen; 3535 ct.nitems = selectlen;
3536 ct.encoding = target;
3461 } 3537 }
3462 3538
3463 XChangeProperty (display->display, rq.requestor, rq.property, 3539 XChangeProperty (dpy, rq.requestor, rq.property,
3464 target, 8, PropModeReplace, 3540 ct.encoding, 8, PropModeReplace,
3465 ct.value, (int)ct.nitems); 3541 ct.value, (int)ct.nitems);
3466 ev.property = rq.property; 3542 ev.property = rq.property;
3467 3543
3468 if (freect) 3544 if (freect)
3469 XFree (ct.value); 3545 XFree (ct.value);
3470 } 3546 }
3547
3471 XSendEvent (display->display, rq.requestor, False, 0L, (XEvent *)&ev); 3548 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} 3549}
3489 3550
3490/* ------------------------------------------------------------------------- */ 3551/* ------------------------------------------------------------------------- */
3491#ifdef USE_XIM 3552#ifdef USE_XIM
3492void 3553void
3493rxvt_term::im_set_position (XPoint *pos) 3554rxvt_term::im_set_position (XPoint &pos) NOTHROW
3494{ 3555{
3495 XWindowAttributes xwa; 3556 XWindowAttributes xwa;
3496 3557
3497 XGetWindowAttributes (display->display, TermWin.vt, &xwa); 3558 XGetWindowAttributes (dpy, vt, &xwa);
3559
3498 pos->x = Col2Pixel (screen.cur.col) + xwa.x; 3560 pos.x = xwa.x + Col2Pixel (screen.cur.col);
3499 pos->y = Height2Pixel ((screen.cur.row + 1)) + xwa.y - TermWin.lineSpace; 3561 pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase;
3500} 3562}
3501
3502#endif 3563#endif
3503/* ------------------------------------------------------------------------- */ 3564
3504 3565#if ENABLE_OVERLAY
3566void
3567rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW
3568{
3569 if (nrow < 1 || ncol < 1)
3570 return;
3571
3572 want_refresh = 1;
3573
3574 scr_overlay_off ();
3575
3576 if (x < 0) x = ncol - w;
3577 if (y < 0) y = nrow - h;
3578
3579 // make space for border
3580 w += 2; min_it (w, ncol);
3581 h += 2; min_it (h, nrow);
3582
3583 x -= 1; clamp_it (x, 0, ncol - w);
3584 y -= 1; clamp_it (y, 0, nrow - h);
3585
3586 ov.x = x; ov.y = y;
3587 ov.w = w; ov.h = h;
3588
3589 ov.text = new text_t *[h];
3590 ov.rend = new rend_t *[h];
3591
3592 for (y = 0; y < h; y++)
3593 {
3594 text_t *tp = ov.text[y] = new text_t[w];
3595 rend_t *rp = ov.rend[y] = new rend_t[w];
3596
3597 text_t t0, t1, t2;
3598 rend_t r = OVERLAY_RSTYLE;
3599
3600 if (y == 0)
3601 t0 = 0x2554, t1 = 0x2550, t2 = 0x2557;
3602 else if (y < h - 1)
3603 t0 = 0x2551, t1 = 0x0020, t2 = 0x2551;
3604 else
3605 t0 = 0x255a, t1 = 0x2550, t2 = 0x255d;
3606
3607 *tp++ = t0;
3608 *rp++ = r;
3609
3610 for (x = w - 2; x > 0; --x)
3611 {
3612 *tp++ = t1;
3613 *rp++ = r;
3614 }
3615
3616 *tp = t2;
3617 *rp = r;
3618 }
3619}
3620
3621void
3622rxvt_term::scr_overlay_off () NOTHROW
3623{
3624 if (!ov.text)
3625 return;
3626
3627 want_refresh = 1;
3628
3629 for (int y = 0; y < ov.h; y++)
3630 {
3631 delete [] ov.text[y];
3632 delete [] ov.rend[y];
3633 }
3634
3635 delete [] ov.text; ov.text = 0;
3636 delete [] ov.rend; ov.rend = 0;
3637}
3638
3639void
3640rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW
3641{
3642 if (!ov.text || x >= ov.w - 2 || y >= ov.h - 2)
3643 return;
3644
3645 x++, y++;
3646
3647 ov.text[y][x] = text;
3648 ov.rend[y][x] = rend;
3649}
3650
3651void
3652rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW
3653{
3654 while (*s)
3655 scr_overlay_set (x++, y, *s++);
3656}
3657
3658void
3659rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW
3660{
3661 while (*s)
3662 {
3663 text_t t = *s++;
3664 int width = WCWIDTH (t);
3665
3666 while (width--)
3667 {
3668 scr_overlay_set (x++, y, t);
3669 t = NOCHAR;
3670 }
3671 }
3672}
3673
3674void
3675rxvt_term::scr_swap_overlay () NOTHROW
3676{
3677 if (!ov.text)
3678 return;
3679
3680 // hide cursor if it is within the overlay area
3681 if (IN_RANGE_EXC (screen.cur.col - ov.x, 0, ov.w)
3682 && IN_RANGE_EXC (screen.cur.row - ov.y, 0, ov.h))
3683 screen.flags &= ~Screen_VisibleCursor;
3684
3685 // swap screen mem with overlay
3686 for (int y = ov.h; y--; )
3687 {
3688 text_t *t1 = ov.text[y];
3689 rend_t *r1 = ov.rend[y];
3690
3691 text_t *t2 = ROW(y + ov.y + view_start).t + ov.x;
3692 rend_t *r2 = ROW(y + ov.y + view_start).r + ov.x;
3693
3694 for (int x = ov.w; x--; )
3695 {
3696 text_t t = *t1; *t1++ = *t2; *t2++ = t;
3697 rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t));
3698 }
3699 }
3700}
3701
3702#endif
3505/* ------------------------------------------------------------------------- * 3703/* ------------------------------------------------------------------------- */
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 3704
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