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

Diff Legend

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