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

Diff Legend

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