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.143 by root, Sat Dec 4 04:06:03 2004 UTC vs.
Revision 1.313 by root, Tue Nov 4 14:25:10 2008 UTC

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

Diff Legend

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