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

Diff Legend

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