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

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

Diff Legend

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