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.20 by pcg, Fri Jan 30 15:58:07 2004 UTC vs.
Revision 1.307 by root, Fri Jun 27 00:44:32 2008 UTC

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

Diff Legend

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