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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.89 by root, Fri Aug 13 22:38:57 2004 UTC vs.
Revision 1.307 by root, Fri Jun 27 00:44:32 2008 UTC

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

Diff Legend

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