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

Diff Legend

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