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

Diff Legend

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