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

Diff Legend

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