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

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

Diff Legend

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