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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.23 by pcg, Sat Jan 31 02:31:17 2004 UTC vs.
Revision 1.193 by root, Thu Dec 22 19:39:29 2005 UTC

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

Diff Legend

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