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

Diff Legend

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