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.164 by root, Wed Jun 22 14:33:23 2005 UTC vs.
Revision 1.300 by ayin, Sun Jan 27 22:48:33 2008 UTC

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

Diff Legend

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