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.104 by root, Tue Aug 17 01:29:12 2004 UTC vs.
Revision 1.296 by root, Wed Jan 9 01:05:24 2008 UTC

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

Diff Legend

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