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

Diff Legend

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