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

Diff Legend

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