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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.43 by pcg, Wed Mar 3 02:59:53 2004 UTC vs.
Revision 1.239 by root, Thu Jan 19 17:14:46 2006 UTC

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

Diff Legend

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