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.35 by pcg, Tue Feb 24 11:48:40 2004 UTC vs.
Revision 1.240 by root, Thu Jan 19 17:21:20 2006 UTC

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

Diff Legend

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