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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.85 by root, Sun Aug 8 16:43:21 2004 UTC vs.
Revision 1.306 by root, Sun Jun 15 10:15:39 2008 UTC

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

Diff Legend

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