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.54 by pcg, Thu Mar 11 00:53:19 2004 UTC vs.
Revision 1.311 by root, Wed Oct 15 14:48:22 2008 UTC

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

Diff Legend

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