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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.77 by root, Mon Jul 26 14:57:12 2004 UTC vs.
Revision 1.313 by root, Tue Nov 4 14:25:10 2008 UTC

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

Diff Legend

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