ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/screen.C
(Generate patch)

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.82 by root, Wed Aug 4 03:33:53 2004 UTC vs.
Revision 1.393 by root, Sun Jul 10 00:40:17 2011 UTC

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

Diff Legend

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