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.82 by root, Wed Aug 4 03:33:53 2004 UTC vs.
Revision 1.430 by root, Sun Jan 13 20:16:40 2013 UTC

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

Diff Legend

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