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.148 by root, Mon Dec 13 01:29:03 2004 UTC vs.
Revision 1.302 by sasha, Wed Feb 6 16:44:47 2008 UTC

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

Diff Legend

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