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.156 by root, Fri Feb 4 11:41:23 2005 UTC vs.
Revision 1.296 by root, Wed Jan 9 01:05:24 2008 UTC

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

Diff Legend

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