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

Diff Legend

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