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

Diff Legend

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