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.29 by pcg, Wed Feb 11 08:13:45 2004 UTC vs.
Revision 1.242 by root, Thu Jan 19 19:51:08 2006 UTC

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

Diff Legend

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