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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines