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.158 by root, Sat Feb 19 19:37:34 2005 UTC vs.
Revision 1.298 by ayin, Sun Jan 20 14:12:39 2008 UTC

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

Diff Legend

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