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

Diff Legend

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