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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.82 by root, Wed Aug 4 03:33:53 2004 UTC vs.
Revision 1.305 by ayin, Thu Feb 21 10:30:24 2008 UTC

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

Diff Legend

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