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

Diff Legend

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