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

Diff Legend

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