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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.77 by root, Mon Jul 26 14:57:12 2004 UTC vs.
Revision 1.291 by root, Fri Dec 14 06:30:50 2007 UTC

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

Diff Legend

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