ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.43 by pcg, Wed Mar 3 02:59:53 2004 UTC vs.
Revision 1.406 by sf-exg, Wed Nov 16 18:26:47 2011 UTC

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

Diff Legend

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