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

Diff Legend

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