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

Diff Legend

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