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.150 by root, Mon Dec 13 19:16:36 2004 UTC vs.
Revision 1.317 by root, Tue Nov 4 15:09:51 2008 UTC

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

Diff Legend

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