1 | /*---------------------------------------------------------------------------* |
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-2007 Marc Lehmann <pcg@goof.com> |
6 | * Copyright (c) 2003-2007 Marc Lehmann <schmorp@schmorp.de> |
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. |
… | |
… | |
28 | #include "rxvt.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
30 | |
30 | |
31 | #include <inttypes.h> |
31 | #include <inttypes.h> |
32 | |
32 | |
33 | #include "salloc.C" // HACK, should be a separate compile! |
|
|
34 | |
|
|
35 | static inline void |
33 | static inline void |
36 | fill_text (text_t *start, text_t value, int len) |
34 | fill_text (text_t *start, text_t value, int len) |
37 | { |
35 | { |
38 | while (len--) |
36 | while (len--) |
39 | *start++ = value; |
37 | *start++ = value; |
40 | } |
38 | } |
41 | |
39 | |
42 | /* ------------------------------------------------------------------------- */ |
40 | /* ------------------------------------------------------------------------- */ |
43 | #define PROP_SIZE 256*1024 |
|
|
44 | #define PASTE_SIZE 32768 |
|
|
45 | #define TABSIZE 8 /* default tab size */ |
41 | #define TABSIZE 8 /* default tab size */ |
46 | |
42 | |
47 | /* ------------------------------------------------------------------------- * |
43 | /* ------------------------------------------------------------------------- * |
48 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
44 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
49 | * ------------------------------------------------------------------------- */ |
45 | * ------------------------------------------------------------------------- */ |
… | |
… | |
100 | |
96 | |
101 | /* Fill part/all of a line with blanks. */ |
97 | /* Fill part/all of a line with blanks. */ |
102 | void |
98 | void |
103 | rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW |
99 | rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW |
104 | { |
100 | { |
105 | if (!l.t) |
101 | if (!l.valid ()) |
106 | { |
102 | { |
107 | lalloc (l); |
103 | l.alloc (); |
108 | col = 0; |
104 | col = 0; |
109 | width = ncol; |
105 | width = ncol; |
110 | } |
106 | } |
111 | |
107 | |
112 | l.touch (); |
108 | l.touch (); |
… | |
… | |
159 | /* ------------------------------------------------------------------------- * |
155 | /* ------------------------------------------------------------------------- * |
160 | * SCREEN INITIALISATION * |
156 | * SCREEN INITIALISATION * |
161 | * ------------------------------------------------------------------------- */ |
157 | * ------------------------------------------------------------------------- */ |
162 | |
158 | |
163 | void |
159 | void |
|
|
160 | rxvt_term::scr_alloc () NOTHROW |
|
|
161 | { |
|
|
162 | int tsize = sizeof (text_t) * ncol; |
|
|
163 | int rsize = sizeof (rend_t) * ncol; |
|
|
164 | |
|
|
165 | // we assume that rend_t size is a sufficient alignment |
|
|
166 | // factor for text_t and line_t values, and we only |
|
|
167 | // need to adjust tsize. |
|
|
168 | tsize = (tsize + sizeof (rend_t) - 1); |
|
|
169 | tsize -= tsize % sizeof (rend_t); |
|
|
170 | |
|
|
171 | int all_rows = total_rows + nrow + nrow; |
|
|
172 | |
|
|
173 | chunk_size = (sizeof (line_t) + rsize + tsize) * all_rows; |
|
|
174 | chunk = chunk_alloc (chunk_size, 0); |
|
|
175 | |
|
|
176 | char *base = (char *)chunk + sizeof (line_t) * all_rows; |
|
|
177 | |
|
|
178 | for (int row = 0; row < all_rows; ++row) |
|
|
179 | { |
|
|
180 | line_t &l = ((line_t *)chunk) [row]; |
|
|
181 | |
|
|
182 | l.t = (text_t *)base; base += tsize; |
|
|
183 | l.r = (rend_t *)base; base += rsize; |
|
|
184 | l.l = -1; |
|
|
185 | l.f = 0; |
|
|
186 | } |
|
|
187 | |
|
|
188 | drawn_buf = (line_t *)chunk; |
|
|
189 | swap_buf = drawn_buf + nrow; |
|
|
190 | row_buf = swap_buf + nrow; |
|
|
191 | } |
|
|
192 | |
|
|
193 | void ecb_cold |
164 | rxvt_term::scr_reset () |
194 | rxvt_term::scr_reset () |
165 | { |
195 | { |
|
|
196 | #if ENABLE_OVERLAY |
|
|
197 | scr_overlay_off (); |
|
|
198 | #endif |
|
|
199 | |
166 | view_start = 0; |
200 | view_start = 0; |
167 | num_scr = 0; |
201 | num_scr = 0; |
168 | |
202 | |
169 | if (ncol == 0) |
203 | if (ncol == 0) |
170 | ncol = 80; |
204 | ncol = 80; |
… | |
… | |
190 | total_rows = nrow + saveLines; |
224 | total_rows = nrow + saveLines; |
191 | |
225 | |
192 | screen.tscroll = 0; |
226 | screen.tscroll = 0; |
193 | screen.bscroll = nrow - 1; |
227 | screen.bscroll = nrow - 1; |
194 | |
228 | |
|
|
229 | void *prev_chunk = chunk; |
|
|
230 | size_t prev_chunk_size = chunk_size; |
|
|
231 | line_t *prev_drawn_buf = drawn_buf; |
|
|
232 | line_t *prev_swap_buf = swap_buf; |
|
|
233 | line_t *prev_row_buf = row_buf; |
|
|
234 | |
|
|
235 | int common_col = min (prev_ncol, ncol); |
|
|
236 | |
|
|
237 | scr_alloc (); |
|
|
238 | |
195 | if (!row_buf) |
239 | if (!prev_row_buf) |
196 | { |
240 | { |
197 | /* |
241 | /* |
198 | * first time called so just malloc everything: don't rely on realloc |
242 | * first time called (or after scr_release) so just malloc everything: don't rely on realloc |
199 | */ |
243 | */ |
200 | top_row = 0; |
244 | top_row = 0; |
201 | term_start = 0; |
245 | term_start = 0; |
202 | |
|
|
203 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
|
|
204 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
|
|
205 | |
|
|
206 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
|
|
207 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
|
|
208 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
|
|
209 | |
|
|
210 | for (int row = nrow; row--; ) |
|
|
211 | { |
|
|
212 | scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); |
|
|
213 | scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
|
|
214 | scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
|
|
215 | } |
|
|
216 | |
246 | |
217 | memset (charsets, 'B', sizeof (charsets)); |
247 | memset (charsets, 'B', sizeof (charsets)); |
218 | rstyle = DEFAULT_RSTYLE; |
248 | rstyle = DEFAULT_RSTYLE; |
219 | screen.flags = Screen_DefaultFlags; |
249 | screen.flags = Screen_DefaultFlags; |
220 | screen.cur.row = screen.cur.col = 0; |
250 | screen.cur.row = screen.cur.col = 0; |
… | |
… | |
243 | { |
273 | { |
244 | /* |
274 | /* |
245 | * add or delete rows as appropriate |
275 | * add or delete rows as appropriate |
246 | */ |
276 | */ |
247 | |
277 | |
248 | rxvt_salloc *old_ta = talloc; talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
|
|
249 | rxvt_salloc *old_ra = ralloc; ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
|
|
250 | |
|
|
251 | #if 0 |
|
|
252 | if (nrow < prev_nrow) |
|
|
253 | { |
|
|
254 | for (int row = nrow; row < prev_nrow; row++) |
|
|
255 | { |
|
|
256 | lfree (swap_buf [row]); |
|
|
257 | lfree (drawn_buf[row]); |
|
|
258 | } |
|
|
259 | } |
|
|
260 | #endif |
|
|
261 | |
|
|
262 | drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); |
|
|
263 | swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); |
|
|
264 | |
|
|
265 | for (int row = min (nrow, prev_nrow); row--; ) |
278 | for (int row = min (nrow, prev_nrow); row--; ) |
266 | { |
279 | { |
267 | lresize (drawn_buf[row]); |
280 | scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); |
268 | lresize (swap_buf [row]); |
281 | scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
269 | } |
|
|
270 | |
282 | |
271 | for (int row = prev_nrow; row < nrow; row++) |
283 | memcpy (drawn_buf [row].t, prev_drawn_buf [row].t, sizeof (text_t) * common_col); |
|
|
284 | memcpy (drawn_buf [row].r, prev_drawn_buf [row].r, sizeof (rend_t) * common_col); |
|
|
285 | |
|
|
286 | memcpy (swap_buf [row].t, prev_swap_buf [row].t, sizeof (text_t) * common_col); |
|
|
287 | memcpy (swap_buf [row].r, prev_swap_buf [row].r, sizeof (rend_t) * common_col); |
|
|
288 | swap_buf [row].l = min (prev_swap_buf [row].l, ncol); |
|
|
289 | swap_buf [row].f = prev_swap_buf [row].f; |
272 | { |
290 | } |
273 | swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
|
|
274 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
|
|
275 | } |
|
|
276 | |
|
|
277 | line_t *old_buf = row_buf; |
|
|
278 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
|
|
279 | |
291 | |
280 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
292 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
281 | int pend = MOD (term_start + top_row , prev_total_rows); |
293 | int pend = MOD (term_start + top_row , prev_total_rows); |
282 | int q = total_rows; // rewrapped row |
294 | int q = total_rows; // rewrapped row |
283 | |
295 | |
… | |
… | |
291 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
303 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
292 | |
304 | |
293 | do |
305 | do |
294 | { |
306 | { |
295 | p = MOD (p - 1, prev_total_rows); |
307 | p = MOD (p - 1, prev_total_rows); |
296 | assert (old_buf [MOD (p, prev_total_rows)].t); |
308 | assert (prev_row_buf [MOD (p, prev_total_rows)].t); |
297 | int plines = 1; |
309 | int plines = 1; |
298 | int llen = old_buf [MOD (p, prev_total_rows)].l; |
310 | int llen = prev_row_buf [MOD (p, prev_total_rows)].l; |
299 | |
311 | |
300 | while (p != pend && old_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
312 | while (p != pend && prev_row_buf [MOD (p - 1, prev_total_rows)].is_longer ()) |
301 | { |
313 | { |
302 | p = MOD (p - 1, prev_total_rows); |
314 | p = MOD (p - 1, prev_total_rows); |
303 | |
315 | |
304 | plines++; |
316 | plines++; |
305 | llen += prev_ncol; |
317 | llen += prev_ncol; |
… | |
… | |
318 | |
330 | |
319 | // re-assemble the full line by destination lines |
331 | // re-assemble the full line by destination lines |
320 | for (int qrow = q; qlines--; qrow++) |
332 | for (int qrow = q; qlines--; qrow++) |
321 | { |
333 | { |
322 | qline = row_buf + qrow; |
334 | qline = row_buf + qrow; |
323 | lalloc (*qline); |
335 | qline->alloc (); // redundant with next line |
324 | qline->l = ncol; |
336 | qline->l = ncol; |
325 | qline->is_longer (1); |
337 | qline->is_longer (1); |
326 | |
338 | |
327 | int qcol = 0; |
339 | int qcol = 0; |
328 | |
340 | |
… | |
… | |
343 | // this seems to upset applications/shells/readline |
355 | // this seems to upset applications/shells/readline |
344 | // least. |
356 | // least. |
345 | if (prow == ocur.row) |
357 | if (prow == ocur.row) |
346 | screen.cur.row = q - (total_rows - nrow); |
358 | screen.cur.row = q - (total_rows - nrow); |
347 | |
359 | |
348 | line_t &pline = old_buf [prow]; |
360 | line_t &pline = prev_row_buf [prow]; |
349 | |
361 | |
350 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
362 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
351 | |
363 | |
352 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
364 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
353 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
365 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
… | |
… | |
374 | { |
386 | { |
375 | // if no scrollback exists (yet), wing, instead of wrap |
387 | // if no scrollback exists (yet), wing, instead of wrap |
376 | |
388 | |
377 | for (int row = min (nrow, prev_nrow); row--; ) |
389 | for (int row = min (nrow, prev_nrow); row--; ) |
378 | { |
390 | { |
379 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
391 | line_t &src = prev_row_buf [MOD (term_start + row, prev_total_rows)]; |
380 | line_t &qline = row_buf [row]; |
392 | line_t &dst = row_buf [row]; |
381 | |
393 | |
382 | qline = pline; |
394 | scr_blank_screen_mem (dst, DEFAULT_RSTYLE); |
383 | lresize (qline); |
395 | |
|
|
396 | memcpy (dst.t, src.t, sizeof (text_t) * common_col); |
|
|
397 | memcpy (dst.r, src.r, sizeof (rend_t) * common_col); |
|
|
398 | dst.l = min (src.l, ncol); |
|
|
399 | dst.f = src.f; |
384 | } |
400 | } |
385 | |
401 | |
386 | for (int row = prev_nrow; row < nrow; row++) |
402 | for (int row = prev_nrow; row < nrow; row++) |
387 | { |
|
|
388 | row_buf [row].clear (); scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); |
403 | scr_blank_screen_mem (row_buf [row], DEFAULT_RSTYLE); |
389 | } |
|
|
390 | |
404 | |
391 | term_start = 0; |
405 | term_start = 0; |
392 | } |
406 | } |
393 | |
|
|
394 | free (old_buf); |
|
|
395 | delete old_ta; |
|
|
396 | delete old_ra; |
|
|
397 | |
407 | |
398 | clamp_it (screen.cur.row, 0, nrow - 1); |
408 | clamp_it (screen.cur.row, 0, nrow - 1); |
399 | clamp_it (screen.cur.col, 0, ncol - 1); |
409 | clamp_it (screen.cur.col, 0, ncol - 1); |
400 | } |
410 | } |
401 | |
411 | |
|
|
412 | for (int row = nrow; row--; ) |
|
|
413 | { |
|
|
414 | if (!ROW (row).valid ()) scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); |
|
|
415 | if (!swap_buf [row].valid ()) scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
|
|
416 | if (!drawn_buf [row].valid ()) scr_blank_screen_mem (drawn_buf [row], DEFAULT_RSTYLE); |
|
|
417 | } |
|
|
418 | |
|
|
419 | chunk_free (prev_chunk, prev_chunk_size); |
|
|
420 | |
402 | free (tabs); |
421 | free (tabs); |
403 | tabs = (char *)rxvt_malloc (ncol); |
422 | tabs = (char *)rxvt_malloc (ncol); |
404 | |
423 | |
405 | for (int col = ncol; --col; ) |
424 | for (int col = ncol; col--; ) |
406 | tabs [col] = col % TABSIZE == 0; |
425 | tabs [col] = col % TABSIZE == 0; |
407 | |
426 | |
408 | CLEAR_ALL_SELECTION (); |
427 | CLEAR_ALL_SELECTION (); |
409 | |
428 | |
410 | prev_nrow = nrow; |
429 | prev_nrow = nrow; |
… | |
… | |
413 | tt_winch (); |
432 | tt_winch (); |
414 | |
433 | |
415 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
434 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
416 | } |
435 | } |
417 | |
436 | |
418 | /* ------------------------------------------------------------------------- */ |
437 | void ecb_cold |
419 | /* |
|
|
420 | * Free everything. That way malloc debugging can find leakage. |
|
|
421 | */ |
|
|
422 | void |
|
|
423 | rxvt_term::scr_release () NOTHROW |
438 | rxvt_term::scr_release () NOTHROW |
424 | { |
439 | { |
425 | if (row_buf) |
440 | chunk_free (chunk, chunk_size); |
426 | { |
441 | chunk = 0; |
427 | delete talloc; talloc = 0; |
442 | row_buf = 0; |
428 | delete ralloc; ralloc = 0; |
|
|
429 | |
443 | |
430 | free (row_buf); |
|
|
431 | free (swap_buf); |
|
|
432 | free (drawn_buf); |
|
|
433 | row_buf = 0; // signal that we freed all the arrays above |
|
|
434 | |
|
|
435 | free (tabs); |
444 | free (tabs); |
436 | tabs = 0; |
445 | tabs = 0; |
437 | } |
|
|
438 | } |
446 | } |
439 | |
447 | |
440 | /* ------------------------------------------------------------------------- */ |
448 | /* ------------------------------------------------------------------------- */ |
441 | /* |
449 | /* |
442 | * Hard/Soft reset |
450 | * Hard/Soft reset |
443 | */ |
451 | */ |
444 | void |
452 | void ecb_cold |
445 | rxvt_term::scr_poweron () |
453 | rxvt_term::scr_poweron () |
446 | { |
454 | { |
447 | scr_release (); |
455 | scr_release (); |
|
|
456 | |
448 | prev_nrow = prev_ncol = 0; |
457 | prev_nrow = prev_ncol = 0; |
449 | rvideo_mode = false; |
458 | rvideo_mode = false; |
450 | scr_soft_reset (); |
459 | scr_soft_reset (); |
451 | scr_reset (); |
460 | scr_reset (); |
452 | |
461 | |
453 | scr_clear (true); |
462 | scr_clear (true); |
454 | scr_refresh (); |
463 | scr_refresh (); |
455 | } |
464 | } |
456 | |
465 | |
457 | void |
466 | void ecb_cold |
458 | rxvt_term::scr_soft_reset () |
467 | rxvt_term::scr_soft_reset () NOTHROW |
459 | { |
468 | { |
460 | /* only affects modes, nothing drastic such as clearing the screen */ |
469 | /* only affects modes, nothing drastic such as clearing the screen */ |
461 | #if ENABLE_OVERLAY |
470 | #if ENABLE_OVERLAY |
462 | scr_overlay_off (); |
471 | scr_overlay_off (); |
463 | #endif |
472 | #endif |
… | |
… | |
518 | assert (s->cur.row >= 0); |
527 | assert (s->cur.row >= 0); |
519 | assert (s->cur.col >= 0); |
528 | assert (s->cur.col >= 0); |
520 | } |
529 | } |
521 | |
530 | |
522 | void |
531 | void |
523 | rxvt_term::scr_swap_screen () |
532 | rxvt_term::scr_swap_screen () NOTHROW |
524 | { |
533 | { |
525 | if (!option (Opt_secondaryScreen)) |
534 | if (!option (Opt_secondaryScreen)) |
526 | return; |
535 | return; |
527 | |
536 | |
528 | for (int i = prev_nrow; i--; ) |
537 | for (int i = prev_nrow; i--; ) |
… | |
… | |
547 | return; |
556 | return; |
548 | |
557 | |
549 | want_refresh = 1; |
558 | want_refresh = 1; |
550 | view_start = 0; |
559 | view_start = 0; |
551 | |
560 | |
552 | selection_check (2); /* check for boundary cross */ |
561 | /* check for boundary cross */ |
|
|
562 | row_col_t pos; |
|
|
563 | pos.row = pos.col = 0; |
|
|
564 | if (ROWCOL_IS_BEFORE (selection.beg, pos) |
|
|
565 | && ROWCOL_IS_AFTER (selection.end, pos)) |
|
|
566 | CLEAR_SELECTION (); |
553 | |
567 | |
554 | current_screen = scrn; |
568 | current_screen = scrn; |
555 | |
569 | |
556 | #if NSCREENS |
570 | #if NSCREENS |
557 | if (option (Opt_secondaryScreen)) |
571 | if (option (Opt_secondaryScreen)) |
… | |
… | |
623 | /* |
637 | /* |
624 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
638 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
625 | * count positive ==> scroll up |
639 | * count positive ==> scroll up |
626 | * count negative ==> scroll down |
640 | * count negative ==> scroll down |
627 | */ |
641 | */ |
628 | int |
642 | int ecb_hot |
629 | rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW |
643 | rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW |
630 | { |
644 | { |
631 | if (count == 0 || (row1 > row2)) |
645 | if (count == 0 || (row1 > row2)) |
632 | return 0; |
646 | return 0; |
633 | |
647 | |
… | |
… | |
636 | |
650 | |
637 | if (count > 0 |
651 | if (count > 0 |
638 | && row1 == 0 |
652 | && row1 == 0 |
639 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
653 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
640 | { |
654 | { |
|
|
655 | min_it (count, total_rows - (nrow - (row2 + 1))); |
|
|
656 | |
641 | top_row = max (top_row - count, -saveLines); |
657 | top_row = max (top_row - count, -saveLines); |
642 | |
|
|
643 | // scroll everything up 'count' lines |
|
|
644 | term_start = (term_start + count) % total_rows; |
|
|
645 | |
658 | |
646 | // sever bottommost line |
659 | // sever bottommost line |
647 | { |
660 | { |
648 | line_t &l = ROW(row2 - count); |
661 | line_t &l = ROW(row2); |
649 | l.is_longer (0); |
662 | l.is_longer (0); |
650 | l.touch (); |
663 | l.touch (); |
651 | } |
664 | } |
652 | |
665 | |
|
|
666 | // scroll everything up 'count' lines |
|
|
667 | term_start = (term_start + count) % total_rows; |
|
|
668 | |
|
|
669 | // now copy lines below the scroll region bottom to the |
|
|
670 | // bottom of the screen again, so they look as if they |
|
|
671 | // hadn't moved. |
|
|
672 | for (int i = nrow; --i > row2; ) |
|
|
673 | { |
|
|
674 | line_t &l1 = ROW(i - count); |
|
|
675 | line_t &l2 = ROW(i); |
|
|
676 | |
|
|
677 | ::swap (l1, l2); |
|
|
678 | l2.touch (); |
|
|
679 | } |
|
|
680 | |
653 | // erase newly scrolled-in lines |
681 | // erase newly scrolled-in lines |
654 | for (int i = count; i--; ) |
682 | for (int i = count; i--; ) |
655 | { |
683 | { |
656 | line_t &l = ROW(nrow - 1 - i); |
684 | line_t &l = ROW(row2 - i); |
657 | |
685 | |
658 | // optimize if already cleared, can be significant on slow machines |
686 | // optimise if already cleared, can be significant on slow machines |
659 | // could be rolled into scr_blank_screen_mem |
687 | // could be rolled into scr_blank_screen_mem |
660 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
688 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
661 | { |
689 | { |
662 | scr_blank_line (l, 0, l.l, rstyle); |
690 | scr_blank_line (l, 0, l.l, rstyle); |
663 | l.l = 0; |
691 | l.l = 0; |
… | |
… | |
665 | } |
693 | } |
666 | else |
694 | else |
667 | scr_blank_screen_mem (l, rstyle); |
695 | scr_blank_screen_mem (l, rstyle); |
668 | } |
696 | } |
669 | |
697 | |
670 | // now copy lines below the scroll region bottom to the |
|
|
671 | // bottom of the screen again, so they look as if they |
|
|
672 | // hadn't moved. |
|
|
673 | for (int i = nrow; --i > row2; ) |
|
|
674 | { |
|
|
675 | line_t &l1 = ROW(i - count); |
|
|
676 | line_t &l2 = ROW(i); |
|
|
677 | |
|
|
678 | ::swap (l1, l2); |
|
|
679 | l2.touch (); |
|
|
680 | } |
|
|
681 | |
|
|
682 | // move and/or clear selection, if any |
698 | // move and/or clear selection, if any |
683 | if (selection.op && current_screen == selection.screen) |
699 | if (selection.op && current_screen == selection.screen |
|
|
700 | && selection.beg.row <= row2) |
684 | { |
701 | { |
685 | selection.beg.row -= count; |
702 | selection.beg.row -= count; |
686 | selection.end.row -= count; |
703 | selection.end.row -= count; |
687 | selection.mark.row -= count; |
704 | selection.mark.row -= count; |
688 | |
705 | |
689 | if (selection.beg.row < top_row |
706 | selection_check (0); |
690 | || selection.end.row < top_row |
|
|
691 | || selection.mark.row < top_row) |
|
|
692 | { |
|
|
693 | CLEAR_ALL_SELECTION (); |
|
|
694 | selection.op = SELECTION_CLEAR; |
|
|
695 | } |
|
|
696 | } |
707 | } |
697 | |
708 | |
698 | // finally move the view window, if desired |
709 | // finally move the view window, if desired |
699 | if (option (Opt_scrollWithBuffer) |
710 | if (option (Opt_scrollWithBuffer) |
700 | && view_start != 0 |
711 | && view_start != 0 |
… | |
… | |
730 | } |
741 | } |
731 | |
742 | |
732 | // use a simple and robust scrolling algorithm, this |
743 | // use a simple and robust scrolling algorithm, this |
733 | // part of scr_scroll_text is not time-critical. |
744 | // part of scr_scroll_text is not time-critical. |
734 | |
745 | |
|
|
746 | // sever line above scroll region |
|
|
747 | if (row1) |
|
|
748 | { |
|
|
749 | line_t &l = ROW(row1 - 1); |
|
|
750 | l.is_longer (0); |
|
|
751 | l.touch (); |
|
|
752 | } |
|
|
753 | |
735 | int rows = row2 - row1 + 1; |
754 | int rows = row2 - row1 + 1; |
736 | |
755 | |
737 | min_it (count, rows); |
756 | min_it (count, rows); |
738 | |
757 | |
739 | line_t *temp_buf = row_buf + total_rows; |
758 | line_t *temp_buf = rxvt_temp_buf<line_t> (rows); |
740 | |
759 | |
741 | for (int row = 0; row < rows; row++) |
760 | for (int row = 0; row < rows; row++) |
742 | { |
761 | { |
743 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
762 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
744 | |
763 | |
… | |
… | |
746 | scr_blank_screen_mem (temp_buf [row], rstyle); |
765 | scr_blank_screen_mem (temp_buf [row], rstyle); |
747 | } |
766 | } |
748 | |
767 | |
749 | for (int row = 0; row < rows; row++) |
768 | for (int row = 0; row < rows; row++) |
750 | ROW(row1 + row) = temp_buf [row]; |
769 | ROW(row1 + row) = temp_buf [row]; |
|
|
770 | |
|
|
771 | // sever bottommost line |
|
|
772 | { |
|
|
773 | line_t &l = ROW(row2); |
|
|
774 | l.is_longer (0); |
|
|
775 | l.touch (); |
|
|
776 | } |
751 | } |
777 | } |
752 | |
778 | |
753 | return count; |
779 | return count; |
754 | } |
780 | } |
755 | |
781 | |
756 | /* ------------------------------------------------------------------------- */ |
782 | /* ------------------------------------------------------------------------- */ |
757 | /* |
783 | /* |
758 | * Add text given in <str> of length <len> to screen struct |
784 | * Add text given in <str> of length <len> to screen struct |
759 | */ |
785 | */ |
760 | void |
786 | void ecb_hot |
761 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW |
787 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW |
762 | { |
788 | { |
763 | if (len <= 0) /* sanity */ |
789 | if (len <= 0) /* sanity */ |
764 | return; |
790 | return; |
765 | |
791 | |
766 | unsigned char checksel; |
792 | bool checksel; |
767 | unicode_t c; |
793 | unicode_t c; |
768 | int ncol = this->ncol; |
794 | int ncol = this->ncol; |
769 | const wchar_t *strend = str + len; |
795 | const wchar_t *strend = str + len; |
770 | |
796 | |
771 | want_refresh = 1; |
797 | want_refresh = 1; |
… | |
… | |
797 | |
823 | |
798 | while (str < strend) |
824 | while (str < strend) |
799 | { |
825 | { |
800 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
826 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
801 | |
827 | |
802 | if (expect_false (c < 0x20)) |
828 | if (ecb_unlikely (c < 0x20)) |
803 | if (c == C0_LF) |
829 | if (c == C0_LF) |
804 | { |
830 | { |
805 | max_it (line->l, screen.cur.col); |
831 | max_it (line->l, screen.cur.col); |
806 | |
832 | |
807 | screen.flags &= ~Screen_WrapNext; |
833 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
826 | { |
852 | { |
827 | scr_tab (1, true); |
853 | scr_tab (1, true); |
828 | continue; |
854 | continue; |
829 | } |
855 | } |
830 | |
856 | |
831 | if (expect_false ( |
857 | if (ecb_unlikely ( |
832 | checksel /* see if we're writing within selection */ |
858 | checksel /* see if we're writing within selection */ |
833 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
859 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
834 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
860 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
835 | )) |
861 | )) |
836 | { |
862 | { |
… | |
… | |
841 | * should be a similar check. |
867 | * should be a similar check. |
842 | */ |
868 | */ |
843 | CLEAR_SELECTION (); |
869 | CLEAR_SELECTION (); |
844 | } |
870 | } |
845 | |
871 | |
846 | if (expect_false (screen.flags & Screen_WrapNext)) |
872 | if (ecb_unlikely (screen.flags & Screen_WrapNext)) |
847 | { |
873 | { |
848 | scr_do_wrap (); |
874 | scr_do_wrap (); |
849 | |
875 | |
850 | line->l = ncol; |
876 | line->l = ncol; |
851 | line->is_longer (1); |
877 | line->is_longer (1); |
… | |
… | |
853 | row = screen.cur.row; |
879 | row = screen.cur.row; |
854 | line = &ROW(row); /* _must_ refresh */ |
880 | line = &ROW(row); /* _must_ refresh */ |
855 | } |
881 | } |
856 | |
882 | |
857 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
883 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
858 | if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
884 | if (ecb_unlikely (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
859 | c = 0xfffd; |
885 | c = 0xfffd; |
860 | |
886 | |
861 | // rely on wcwidth to tell us the character width, do wcwidth before |
887 | // rely on wcwidth to tell us the character width, do wcwidth before |
862 | // further replacements, as wcwidth might return -1 for the line |
888 | // further replacements, as wcwidth might return -1 for the line |
863 | // drawing characters below as they might be invalid in the current |
889 | // drawing characters below as they might be invalid in the current |
864 | // locale. |
890 | // locale. |
865 | int width = WCWIDTH (c); |
891 | int width = WCWIDTH (c); |
866 | |
892 | |
867 | if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL |
893 | if (ecb_unlikely (charsets [screen.charset] == '0')) // DEC SPECIAL |
868 | { |
894 | { |
869 | // vt100 special graphics and line drawing |
895 | // vt100 special graphics and line drawing |
870 | // 5f-7e standard vt100 |
896 | // 5f-7e standard vt100 |
871 | // 40-5e rxvt extension for extra curses acs chars |
897 | // 40-5e rxvt extension for extra curses acs chars |
872 | static uint16_t vt100_0[62] = { // 41 .. 7e |
898 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
885 | c = vt100_0[c - 0x41]; |
911 | c = vt100_0[c - 0x41]; |
886 | width = 1; // vt100 line drawing characters are always single-width |
912 | width = 1; // vt100 line drawing characters are always single-width |
887 | } |
913 | } |
888 | } |
914 | } |
889 | |
915 | |
890 | if (expect_false (screen.flags & Screen_Insert)) |
916 | if (ecb_unlikely (screen.flags & Screen_Insert)) |
891 | scr_insdel_chars (width, INSERT); |
917 | scr_insdel_chars (width, INSERT); |
892 | |
918 | |
893 | if (width != 0) |
919 | if (width != 0) |
894 | { |
920 | { |
895 | #if !UNICODE_3 |
921 | #if !UNICODE_3 |
… | |
… | |
903 | #endif |
929 | #endif |
904 | |
930 | |
905 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
931 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
906 | |
932 | |
907 | // if the character doesn't fit into the remaining columns... |
933 | // if the character doesn't fit into the remaining columns... |
908 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
934 | if (ecb_unlikely (screen.cur.col > ncol - width && ncol >= width)) |
909 | { |
935 | { |
910 | if (screen.flags & Screen_Autowrap) |
936 | if (screen.flags & Screen_Autowrap) |
911 | { |
937 | { |
912 | // ... artificially enlargen the previous one |
938 | // ... artificially enlargen the previous one |
913 | c = NOCHAR; |
939 | c = NOCHAR; |
… | |
… | |
917 | else |
943 | else |
918 | screen.cur.col = ncol - width; |
944 | screen.cur.col = ncol - width; |
919 | } |
945 | } |
920 | |
946 | |
921 | // nuke the character at this position, if required |
947 | // nuke the character at this position, if required |
922 | // due to wonderful coincidents everywhere else in this loop |
948 | // due to wonderful coincidences everywhere else in this loop |
923 | // we never have to check for overwriting a wide char itself, |
949 | // we never have to check for overwriting a wide char itself, |
924 | // only its tail. |
950 | // only its tail. |
925 | if (expect_false (line->t[screen.cur.col] == NOCHAR)) |
951 | if (ecb_unlikely (line->t[screen.cur.col] == NOCHAR)) |
926 | scr_kill_char (*line, screen.cur.col); |
952 | scr_kill_char (*line, screen.cur.col); |
927 | |
953 | |
928 | line->touch (); |
954 | line->touch (); |
929 | |
955 | |
930 | do |
956 | do |
931 | { |
957 | { |
932 | line->t[screen.cur.col] = c; |
958 | line->t[screen.cur.col] = c; |
933 | line->r[screen.cur.col] = rend; |
959 | line->r[screen.cur.col] = rend; |
934 | |
960 | |
935 | if (expect_true (screen.cur.col < ncol - 1)) |
961 | if (ecb_likely (screen.cur.col < ncol - 1)) |
936 | screen.cur.col++; |
962 | screen.cur.col++; |
937 | else |
963 | else |
938 | { |
964 | { |
939 | line->l = ncol; |
965 | line->l = ncol; |
940 | if (screen.flags & Screen_Autowrap) |
966 | if (screen.flags & Screen_Autowrap) |
… | |
… | |
943 | goto end_of_line; |
969 | goto end_of_line; |
944 | } |
970 | } |
945 | |
971 | |
946 | c = NOCHAR; |
972 | c = NOCHAR; |
947 | } |
973 | } |
948 | while (expect_false (--width > 0)); |
974 | while (ecb_unlikely (--width > 0)); |
949 | |
975 | |
950 | // pad with spaces when overwriting wide character with smaller one |
976 | // pad with spaces when overwriting wide character with smaller one |
951 | for (int c = screen.cur.col; expect_false (c < ncol && line->t[c] == NOCHAR); c++) |
977 | for (int c = screen.cur.col; ecb_unlikely (c < ncol && line->t[c] == NOCHAR); c++) |
952 | { |
978 | { |
953 | line->t[c] = ' '; |
979 | line->t[c] = ' '; |
954 | line->r[c] = rend; |
980 | line->r[c] = rend; |
955 | } |
981 | } |
956 | |
982 | |
… | |
… | |
1115 | * XTERM_SEQ: ESC 6 |
1141 | * XTERM_SEQ: ESC 6 |
1116 | * Move cursor left in row. If we're at the left boundary, shift everything |
1142 | * Move cursor left in row. If we're at the left boundary, shift everything |
1117 | * in that row right. Clear left column. |
1143 | * in that row right. Clear left column. |
1118 | */ |
1144 | */ |
1119 | #if !ENABLE_MINIMAL |
1145 | #if !ENABLE_MINIMAL |
1120 | void |
1146 | void ecb_cold |
1121 | rxvt_term::scr_backindex () NOTHROW |
1147 | rxvt_term::scr_backindex () NOTHROW |
1122 | { |
1148 | { |
1123 | if (screen.cur.col > 0) |
1149 | if (screen.cur.col > 0) |
1124 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1150 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1125 | else |
1151 | else |
… | |
… | |
1132 | * XTERM_SEQ: ESC 9 |
1158 | * XTERM_SEQ: ESC 9 |
1133 | * Move cursor right in row. If we're at the right boundary, shift everything |
1159 | * Move cursor right in row. If we're at the right boundary, shift everything |
1134 | * in that row left. Clear right column. |
1160 | * in that row left. Clear right column. |
1135 | */ |
1161 | */ |
1136 | #if !ENABLE_MINIMAL |
1162 | #if !ENABLE_MINIMAL |
1137 | void |
1163 | void ecb_cold |
1138 | rxvt_term::scr_forwardindex () NOTHROW |
1164 | rxvt_term::scr_forwardindex () NOTHROW |
1139 | { |
1165 | { |
1140 | if (screen.cur.col < ncol - 1) |
1166 | if (screen.cur.col < ncol - 1) |
1141 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1167 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1142 | else |
1168 | else |
… | |
… | |
1293 | scr_blank_line (line, col, num, rstyle); |
1319 | scr_blank_line (line, col, num, rstyle); |
1294 | } |
1320 | } |
1295 | |
1321 | |
1296 | /* ------------------------------------------------------------------------- */ |
1322 | /* ------------------------------------------------------------------------- */ |
1297 | /* |
1323 | /* |
1298 | * Erase part of whole of the screen |
1324 | * Erase part or whole of the screen |
1299 | * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J |
1325 | * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J |
1300 | * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J |
1326 | * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J |
1301 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1327 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1302 | */ |
1328 | */ |
1303 | void |
1329 | void |
… | |
… | |
1312 | ZERO_SCROLLBACK (); |
1338 | ZERO_SCROLLBACK (); |
1313 | |
1339 | |
1314 | switch (mode) |
1340 | switch (mode) |
1315 | { |
1341 | { |
1316 | case 0: /* erase to end of screen */ |
1342 | case 0: /* erase to end of screen */ |
1317 | selection_check (1); |
|
|
1318 | scr_erase_line (0); |
1343 | scr_erase_line (0); |
1319 | row = screen.cur.row + 1; /* possible OOB */ |
1344 | row = screen.cur.row + 1; /* possible OOB */ |
1320 | num = nrow - row; |
1345 | num = nrow - row; |
1321 | break; |
1346 | break; |
1322 | case 1: /* erase to beginning of screen */ |
1347 | case 1: /* erase to beginning of screen */ |
1323 | selection_check (3); |
|
|
1324 | scr_erase_line (1); |
1348 | scr_erase_line (1); |
1325 | row = 0; |
1349 | row = 0; |
1326 | num = screen.cur.row; |
1350 | num = screen.cur.row; |
1327 | break; |
1351 | break; |
1328 | case 2: /* erase whole screen */ |
1352 | case 2: /* erase whole screen */ |
1329 | selection_check (3); |
|
|
1330 | row = 0; |
1353 | row = 0; |
1331 | num = nrow; |
1354 | num = nrow; |
1332 | break; |
1355 | break; |
1333 | default: |
1356 | default: |
1334 | return; |
1357 | return; |
… | |
… | |
1351 | { |
1374 | { |
1352 | ren = DEFAULT_RSTYLE; |
1375 | ren = DEFAULT_RSTYLE; |
1353 | |
1376 | |
1354 | if (mapped) |
1377 | if (mapped) |
1355 | XClearArea (dpy, vt, 0, |
1378 | XClearArea (dpy, vt, 0, |
1356 | Row2Pixel (row - view_start), (unsigned int)width, |
1379 | Row2Pixel (row - view_start), (unsigned int)vt_width, |
1357 | (unsigned int)Height2Pixel (num), False); |
1380 | (unsigned int)Height2Pixel (num), False); |
1358 | } |
1381 | } |
1359 | else |
1382 | else |
1360 | { |
1383 | { |
1361 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1384 | ren = rstyle & (RS_fgMask | RS_bgMask); |
… | |
… | |
1364 | { |
1387 | { |
1365 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1388 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1366 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1389 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1367 | XFillRectangle (dpy, vt, gc, |
1390 | XFillRectangle (dpy, vt, gc, |
1368 | 0, Row2Pixel (row - view_start), |
1391 | 0, Row2Pixel (row - view_start), |
1369 | (unsigned int)width, |
1392 | (unsigned int)vt_width, |
1370 | (unsigned int)Height2Pixel (num)); |
1393 | (unsigned int)Height2Pixel (num)); |
1371 | gcvalue.foreground = pix_colors[Color_fg]; |
1394 | gcvalue.foreground = pix_colors[Color_fg]; |
1372 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1395 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1373 | } |
1396 | } |
1374 | } |
1397 | } |
… | |
… | |
1396 | /* ------------------------------------------------------------------------- */ |
1419 | /* ------------------------------------------------------------------------- */ |
1397 | /* |
1420 | /* |
1398 | * Fill the screen with `E's |
1421 | * Fill the screen with `E's |
1399 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1422 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1400 | */ |
1423 | */ |
1401 | void |
1424 | void ecb_cold |
1402 | rxvt_term::scr_E () NOTHROW |
1425 | rxvt_term::scr_E () NOTHROW |
1403 | { |
1426 | { |
1404 | rend_t fs; |
1427 | rend_t fs; |
1405 | |
1428 | |
1406 | want_refresh = 1; |
1429 | want_refresh = 1; |
1407 | ZERO_SCROLLBACK (); |
1430 | ZERO_SCROLLBACK (); |
1408 | |
1431 | |
1409 | num_scr_allow = 0; |
1432 | num_scr_allow = 0; |
1410 | selection_check (3); |
1433 | |
|
|
1434 | row_col_t pos; |
|
|
1435 | pos.row = pos.col = 0; |
|
|
1436 | if (ROWCOL_IS_AFTER (selection.end, pos)) |
|
|
1437 | CLEAR_SELECTION (); |
1411 | |
1438 | |
1412 | fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); |
1439 | fs = SET_FONT (rstyle, FONTSET (rstyle)->find_font ('E')); |
1413 | for (int row = nrow; row--; ) |
1440 | for (int row = nrow; row--; ) |
1414 | { |
1441 | { |
1415 | line_t &line = ROW(row); |
1442 | line_t &line = ROW(row); |
… | |
… | |
1566 | /* ------------------------------------------------------------------------- */ |
1593 | /* ------------------------------------------------------------------------- */ |
1567 | /* |
1594 | /* |
1568 | * Set the scrolling region |
1595 | * Set the scrolling region |
1569 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1596 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1570 | */ |
1597 | */ |
1571 | void |
1598 | void ecb_cold |
1572 | rxvt_term::scr_scroll_region (int top, int bot) NOTHROW |
1599 | rxvt_term::scr_scroll_region (int top, int bot) NOTHROW |
1573 | { |
1600 | { |
1574 | max_it (top, 0); |
1601 | max_it (top, 0); |
1575 | min_it (bot, nrow - 1); |
1602 | min_it (bot, nrow - 1); |
1576 | |
1603 | |
… | |
… | |
1586 | /* |
1613 | /* |
1587 | * Make the cursor visible/invisible |
1614 | * Make the cursor visible/invisible |
1588 | * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h |
1615 | * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h |
1589 | * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l |
1616 | * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l |
1590 | */ |
1617 | */ |
1591 | void |
1618 | void ecb_cold |
1592 | rxvt_term::scr_cursor_visible (int mode) NOTHROW |
1619 | rxvt_term::scr_cursor_visible (int mode) NOTHROW |
1593 | { |
1620 | { |
1594 | want_refresh = 1; |
1621 | want_refresh = 1; |
1595 | |
1622 | |
1596 | if (mode) |
1623 | if (mode) |
… | |
… | |
1603 | /* |
1630 | /* |
1604 | * Set/unset automatic wrapping |
1631 | * Set/unset automatic wrapping |
1605 | * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h |
1632 | * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h |
1606 | * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l |
1633 | * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l |
1607 | */ |
1634 | */ |
1608 | void |
1635 | void ecb_cold |
1609 | rxvt_term::scr_autowrap (int mode) NOTHROW |
1636 | rxvt_term::scr_autowrap (int mode) NOTHROW |
1610 | { |
1637 | { |
1611 | if (mode) |
1638 | if (mode) |
1612 | screen.flags |= Screen_Autowrap; |
1639 | screen.flags |= Screen_Autowrap; |
1613 | else |
1640 | else |
… | |
… | |
1622 | * Relative mode: line numbers are relative to top margin of scrolling region |
1649 | * Relative mode: line numbers are relative to top margin of scrolling region |
1623 | * and the cursor cannot be moved outside. |
1650 | * and the cursor cannot be moved outside. |
1624 | * XTERM_SEQ: Set Absolute: ESC [ ? 6 h |
1651 | * XTERM_SEQ: Set Absolute: ESC [ ? 6 h |
1625 | * XTERM_SEQ: Set Relative: ESC [ ? 6 l |
1652 | * XTERM_SEQ: Set Relative: ESC [ ? 6 l |
1626 | */ |
1653 | */ |
1627 | void |
1654 | void ecb_cold |
1628 | rxvt_term::scr_relative_origin (int mode) NOTHROW |
1655 | rxvt_term::scr_relative_origin (int mode) NOTHROW |
1629 | { |
1656 | { |
1630 | if (mode) |
1657 | if (mode) |
1631 | screen.flags |= Screen_Relative; |
1658 | screen.flags |= Screen_Relative; |
1632 | else |
1659 | else |
… | |
… | |
1639 | /* |
1666 | /* |
1640 | * Set insert/replace mode |
1667 | * Set insert/replace mode |
1641 | * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h |
1668 | * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h |
1642 | * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l |
1669 | * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l |
1643 | */ |
1670 | */ |
1644 | void |
1671 | void ecb_cold |
1645 | rxvt_term::scr_insert_mode (int mode) NOTHROW |
1672 | rxvt_term::scr_insert_mode (int mode) NOTHROW |
1646 | { |
1673 | { |
1647 | if (mode) |
1674 | if (mode) |
1648 | screen.flags |= Screen_Insert; |
1675 | screen.flags |= Screen_Insert; |
1649 | else |
1676 | else |
… | |
… | |
1655 | * Set/Unset tabs |
1682 | * Set/Unset tabs |
1656 | * XTERM_SEQ: Set tab at current column : ESC H |
1683 | * XTERM_SEQ: Set tab at current column : ESC H |
1657 | * XTERM_SEQ: Clear tab at current column: ESC [ 0 g |
1684 | * XTERM_SEQ: Clear tab at current column: ESC [ 0 g |
1658 | * XTERM_SEQ: Clear all tabs : ESC [ 3 g |
1685 | * XTERM_SEQ: Clear all tabs : ESC [ 3 g |
1659 | */ |
1686 | */ |
1660 | void |
1687 | void ecb_cold |
1661 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1688 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1662 | { |
1689 | { |
1663 | if (mode < 0) |
1690 | if (mode < 0) |
1664 | memset (tabs, 0, ncol); |
1691 | memset (tabs, 0, ncol); |
1665 | else if (screen.cur.col < ncol) |
1692 | else if (screen.cur.col < ncol) |
… | |
… | |
1684 | if (rvideo_state != on) |
1711 | if (rvideo_state != on) |
1685 | { |
1712 | { |
1686 | rvideo_state = on; |
1713 | rvideo_state = on; |
1687 | |
1714 | |
1688 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1715 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1689 | #ifdef HAVE_BG_PIXMAP |
1716 | #ifdef HAVE_IMG |
1690 | if (bgPixmap.pixmap == None) |
1717 | if (bg_img == 0) |
1691 | #endif |
1718 | #endif |
1692 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1719 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1693 | |
1720 | |
1694 | XGCValues gcvalue; |
1721 | XGCValues gcvalue; |
1695 | gcvalue.foreground = pix_colors[Color_fg]; |
1722 | gcvalue.foreground = pix_colors[Color_fg]; |
… | |
… | |
1704 | /* ------------------------------------------------------------------------- */ |
1731 | /* ------------------------------------------------------------------------- */ |
1705 | /* |
1732 | /* |
1706 | * Report current cursor position |
1733 | * Report current cursor position |
1707 | * XTERM_SEQ: Report position: ESC [ 6 n |
1734 | * XTERM_SEQ: Report position: ESC [ 6 n |
1708 | */ |
1735 | */ |
1709 | void |
1736 | void ecb_cold |
1710 | rxvt_term::scr_report_position () NOTHROW |
1737 | rxvt_term::scr_report_position () NOTHROW |
1711 | { |
1738 | { |
1712 | tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); |
1739 | tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); |
1713 | } |
1740 | } |
1714 | |
1741 | |
… | |
… | |
1717 | * ------------------------------------------------------------------------- */ |
1744 | * ------------------------------------------------------------------------- */ |
1718 | |
1745 | |
1719 | /* |
1746 | /* |
1720 | * Set font style |
1747 | * Set font style |
1721 | */ |
1748 | */ |
1722 | void |
1749 | void ecb_cold |
1723 | rxvt_term::set_font_style () NOTHROW |
1750 | rxvt_term::set_font_style () NOTHROW |
1724 | { |
1751 | { |
1725 | #if 0 |
1752 | #if 0 |
1726 | switch (charsets [screen.charset]) |
1753 | switch (charsets [screen.charset]) |
1727 | { |
1754 | { |
… | |
… | |
1749 | * XTERM_SEQ: Invoke G0 character set: CTRL-O |
1776 | * XTERM_SEQ: Invoke G0 character set: CTRL-O |
1750 | * XTERM_SEQ: Invoke G1 character set: CTRL-N |
1777 | * XTERM_SEQ: Invoke G1 character set: CTRL-N |
1751 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1778 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1752 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1779 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1753 | */ |
1780 | */ |
1754 | void |
1781 | void ecb_cold |
1755 | rxvt_term::scr_charset_choose (int set) NOTHROW |
1782 | rxvt_term::scr_charset_choose (int set) NOTHROW |
1756 | { |
1783 | { |
1757 | screen.charset = set; |
1784 | screen.charset = set; |
1758 | set_font_style (); |
1785 | set_font_style (); |
1759 | } |
1786 | } |
… | |
… | |
1780 | * ------------------------------------------------------------------------- */ |
1807 | * ------------------------------------------------------------------------- */ |
1781 | |
1808 | |
1782 | /* |
1809 | /* |
1783 | * refresh matching text. |
1810 | * refresh matching text. |
1784 | */ |
1811 | */ |
1785 | bool |
1812 | bool ecb_cold |
1786 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW |
1813 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW |
1787 | { |
1814 | { |
1788 | bool found = false; |
1815 | bool found = false; |
1789 | |
1816 | |
1790 | for (int i = 0; i < nrow; i++) |
1817 | for (int i = 0; i < nrow; i++) |
… | |
… | |
1809 | PART_BEG = 0, |
1836 | PART_BEG = 0, |
1810 | PART_END, |
1837 | PART_END, |
1811 | RC_COUNT |
1838 | RC_COUNT |
1812 | }; |
1839 | }; |
1813 | |
1840 | |
1814 | void |
1841 | void ecb_hot |
1815 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW |
1842 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW |
1816 | { |
1843 | { |
1817 | int i; |
1844 | int i; |
1818 | row_col_t rc[RC_COUNT]; |
1845 | row_col_t rc[RC_COUNT]; |
1819 | |
1846 | |
… | |
… | |
1856 | * Refresh the entire screen |
1883 | * Refresh the entire screen |
1857 | */ |
1884 | */ |
1858 | void |
1885 | void |
1859 | rxvt_term::scr_touch (bool refresh) NOTHROW |
1886 | rxvt_term::scr_touch (bool refresh) NOTHROW |
1860 | { |
1887 | { |
1861 | scr_expose (0, 0, width, height, refresh); |
1888 | scr_expose (0, 0, vt_width, vt_height, refresh); |
1862 | } |
1889 | } |
1863 | |
1890 | |
1864 | /* ------------------------------------------------------------------------- */ |
1891 | /* ------------------------------------------------------------------------- */ |
1865 | /* |
1892 | /* |
1866 | * Move the display so that the line represented by scrollbar value Y is at |
1893 | * Move the display so that the line represented by scrollbar value Y is at |
… | |
… | |
1922 | |
1949 | |
1923 | # ifndef NO_MAPALERT |
1950 | # ifndef NO_MAPALERT |
1924 | # ifdef MAPALERT_OPTION |
1951 | # ifdef MAPALERT_OPTION |
1925 | if (option (Opt_mapAlert)) |
1952 | if (option (Opt_mapAlert)) |
1926 | # endif |
1953 | # endif |
1927 | XMapWindow (dpy, parent[0]); |
1954 | XMapWindow (dpy, parent); |
1928 | # endif |
1955 | # endif |
1929 | |
1956 | |
1930 | # if ENABLE_FRILLS |
1957 | # if ENABLE_FRILLS |
1931 | if (option (Opt_urgentOnBell)) |
1958 | if (option (Opt_urgentOnBell)) |
1932 | set_urgency (1); |
1959 | set_urgency (1); |
… | |
… | |
1945 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1972 | HOOK_INVOKE ((this, HOOK_BELL, DT_END)); |
1946 | #endif |
1973 | #endif |
1947 | } |
1974 | } |
1948 | |
1975 | |
1949 | /* ------------------------------------------------------------------------- */ |
1976 | /* ------------------------------------------------------------------------- */ |
1950 | /* ARGSUSED */ |
1977 | void ecb_cold |
1951 | void |
|
|
1952 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1978 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1953 | { |
1979 | { |
1954 | #ifdef PRINTPIPE |
1980 | #ifdef PRINTPIPE |
1955 | int nrows, row_start; |
1981 | int nrows, row_start; |
1956 | FILE *fd = popen_printer (); |
1982 | FILE *fd = popen_printer (); |
… | |
… | |
2005 | /* |
2031 | /* |
2006 | * Refresh the screen |
2032 | * Refresh the screen |
2007 | * drawn_text/drawn_rend contain the screen information before the update. |
2033 | * drawn_text/drawn_rend contain the screen information before the update. |
2008 | * screen.text/screen.rend contain what the screen will change to. |
2034 | * screen.text/screen.rend contain what the screen will change to. |
2009 | */ |
2035 | */ |
2010 | void |
2036 | void ecb_hot |
2011 | rxvt_term::scr_refresh () NOTHROW |
2037 | rxvt_term::scr_refresh () NOTHROW |
2012 | { |
2038 | { |
2013 | int16_t col, row, /* column/row we're processing */ |
2039 | int16_t col, row, /* column/row we're processing */ |
2014 | ocrow; /* old cursor row */ |
2040 | ocrow; /* old cursor row */ |
2015 | int i; /* tmp */ |
2041 | int i; /* tmp */ |
… | |
… | |
2029 | * A: set up vars |
2055 | * A: set up vars |
2030 | */ |
2056 | */ |
2031 | refresh_count = 0; |
2057 | refresh_count = 0; |
2032 | |
2058 | |
2033 | unsigned int old_screen_flags = screen.flags; |
2059 | unsigned int old_screen_flags = screen.flags; |
2034 | char have_bg = 0; |
2060 | bool have_bg = 0; |
2035 | #ifdef HAVE_BG_PIXMAP |
2061 | #ifdef HAVE_IMG |
2036 | have_bg = bgPixmap.pixmap != None; |
2062 | have_bg = bg_img != 0; |
2037 | #endif |
2063 | #endif |
2038 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2064 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2039 | |
2065 | |
2040 | /* |
2066 | /* |
2041 | * B: reverse any characters which are selected |
2067 | * B: reverse any characters which are selected |
… | |
… | |
2045 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
2071 | HOOK_INVOKE ((this, HOOK_REFRESH_BEGIN, DT_END)); |
2046 | #if ENABLE_OVERLAY |
2072 | #if ENABLE_OVERLAY |
2047 | scr_swap_overlay (); |
2073 | scr_swap_overlay (); |
2048 | #endif |
2074 | #endif |
2049 | |
2075 | |
2050 | char showcursor = screen.flags & Screen_VisibleCursor; |
2076 | bool showcursor = screen.flags & Screen_VisibleCursor; |
2051 | |
2077 | |
2052 | /* |
2078 | /* |
2053 | * C: set the cursor character (s) |
2079 | * C: set the cursor character (s) |
2054 | */ |
2080 | */ |
2055 | { |
2081 | { |
2056 | unsigned char setoldcursor; |
2082 | bool setoldcursor; |
2057 | |
2083 | |
2058 | #ifdef CURSOR_BLINK |
2084 | #ifdef CURSOR_BLINK |
2059 | if (hidden_cursor) |
2085 | if (hidden_cursor) |
2060 | showcursor = 0; |
2086 | showcursor = 0; |
2061 | #endif |
2087 | #endif |
… | |
… | |
2148 | { |
2174 | { |
2149 | int16_t nits; |
2175 | int16_t nits; |
2150 | int i = num_scr; |
2176 | int i = num_scr; |
2151 | int j; |
2177 | int j; |
2152 | int len, wlen; |
2178 | int len, wlen; |
2153 | dLocal (int, num_scr); |
|
|
2154 | |
2179 | |
2155 | j = nrow; |
2180 | j = nrow; |
2156 | wlen = len = -1; |
2181 | wlen = len = -1; |
2157 | row = i > 0 ? 0 : j - 1; |
2182 | row = i > 0 ? 0 : j - 1; |
2158 | |
2183 | |
… | |
… | |
2233 | continue; |
2258 | continue; |
2234 | |
2259 | |
2235 | // redraw one or more characters |
2260 | // redraw one or more characters |
2236 | |
2261 | |
2237 | // seek to the beginning of wide characters |
2262 | // seek to the beginning of wide characters |
2238 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2263 | while (ecb_unlikely (stp[col] == NOCHAR && col > 0)) |
2239 | --col; |
2264 | --col; |
2240 | |
2265 | |
2241 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2266 | rend_t rend = srp[col]; /* screen rendition (target rendition) */ |
2242 | text_t *text = stp + col; |
2267 | text_t *text = stp + col; |
2243 | int count = 1; |
2268 | int count = 1; |
… | |
… | |
2281 | |
2306 | |
2282 | col--; /* went one too far. move back */ |
2307 | col--; /* went one too far. move back */ |
2283 | count -= i; /* dump any matching trailing chars */ |
2308 | count -= i; /* dump any matching trailing chars */ |
2284 | |
2309 | |
2285 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2310 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2286 | while (expect_false (i && text[count] == NOCHAR)) |
2311 | while (ecb_unlikely (i && text[count] == NOCHAR)) |
2287 | count++, i--; |
2312 | count++, i--; |
2288 | |
2313 | |
2289 | /* |
2314 | /* |
2290 | * Determine the attributes for the string |
2315 | * Determine the attributes for the string |
2291 | */ |
2316 | */ |
2292 | int fore = fgcolor_of (rend); // desired foreground |
2317 | int fore = fgcolor_of (rend); // desired foreground |
2293 | int back = bgcolor_of (rend); // desired background |
2318 | int back = bgcolor_of (rend); // desired background |
2294 | |
2319 | |
2295 | // only do special processing if any attributes are set, which is unlikely |
2320 | // only do special processing if any attributes are set, which is unlikely |
2296 | if (expect_false (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2321 | if (ecb_unlikely (rend & (RS_baseattrMask | RS_Careful | RS_Sel))) |
2297 | { |
2322 | { |
2298 | bool invert = rend & RS_RVid; |
2323 | bool invert = rend & RS_RVid; |
2299 | |
2324 | |
2300 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2325 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2301 | if (rend & RS_Bold && fore == Color_fg) |
2326 | if (rend & RS_Bold && fore == Color_fg) |
… | |
… | |
2390 | /* |
2415 | /* |
2391 | * Actually do the drawing of the string here |
2416 | * Actually do the drawing of the string here |
2392 | */ |
2417 | */ |
2393 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2418 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2394 | |
2419 | |
2395 | if (expect_true (have_bg && back == Color_bg)) |
2420 | if (ecb_likely (have_bg && back == Color_bg)) |
2396 | { |
2421 | { |
2397 | // this is very ugly, maybe push it into ->draw? |
2422 | // this is very ugly, maybe push it into ->draw? |
2398 | |
2423 | |
2399 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2424 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2400 | if (text[i] != ' ') |
2425 | if (text[i] != ' ') |
… | |
… | |
2407 | did_clear: ; |
2432 | did_clear: ; |
2408 | } |
2433 | } |
2409 | else |
2434 | else |
2410 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2435 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2411 | |
2436 | |
2412 | if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) |
2437 | if (ecb_unlikely (rend & RS_Uline && font->descent > 1 && fore != back)) |
2413 | { |
2438 | { |
2414 | #if ENABLE_FRILLS |
2439 | #if ENABLE_FRILLS |
2415 | if (ISSET_PIXCOLOR (Color_underline)) |
2440 | if (ISSET_PIXCOLOR (Color_underline)) |
2416 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2441 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2417 | else |
2442 | else |
… | |
… | |
2463 | |
2488 | |
2464 | XDrawRectangle (dpy, vt, gc, |
2489 | XDrawRectangle (dpy, vt, gc, |
2465 | Col2Pixel (col), |
2490 | Col2Pixel (col), |
2466 | Row2Pixel (oldcursor.row), |
2491 | Row2Pixel (oldcursor.row), |
2467 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2492 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2468 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2493 | (unsigned int) (Height2Pixel (1) - 1)); |
2469 | } |
2494 | } |
2470 | } |
2495 | } |
2471 | |
2496 | |
2472 | /* |
2497 | /* |
2473 | * H: cleanup selection |
2498 | * H: cleanup selection |
… | |
… | |
2482 | screen.flags = old_screen_flags; |
2507 | screen.flags = old_screen_flags; |
2483 | num_scr = 0; |
2508 | num_scr = 0; |
2484 | num_scr_allow = 1; |
2509 | num_scr_allow = 1; |
2485 | } |
2510 | } |
2486 | |
2511 | |
2487 | void |
2512 | void ecb_cold |
2488 | rxvt_term::scr_remap_chars (line_t &l) NOTHROW |
2513 | rxvt_term::scr_remap_chars (line_t &l) NOTHROW |
2489 | { |
2514 | { |
2490 | if (!l.t) |
2515 | if (!l.valid ()) |
2491 | return; |
2516 | return; |
2492 | |
2517 | |
2493 | l.touch (); // maybe a bit of an overkill, but it's not performance-relevant |
2518 | l.touch (); // maybe a bit of an overkill, but it's not performance-relevant |
2494 | |
2519 | |
2495 | for (int i = ncol; i--; ) |
2520 | for (int i = ncol; i--; ) |
2496 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2521 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2497 | } |
2522 | } |
2498 | |
2523 | |
2499 | void |
2524 | void ecb_cold |
2500 | rxvt_term::scr_remap_chars () NOTHROW |
2525 | rxvt_term::scr_remap_chars () NOTHROW |
2501 | { |
2526 | { |
2502 | for (int i = total_rows; i--; ) |
2527 | for (int i = total_rows; i--; ) |
2503 | scr_remap_chars (row_buf [i]); |
2528 | scr_remap_chars (row_buf [i]); |
2504 | |
2529 | |
… | |
… | |
2507 | scr_remap_chars (drawn_buf [i]); |
2532 | scr_remap_chars (drawn_buf [i]); |
2508 | scr_remap_chars (swap_buf [i]); |
2533 | scr_remap_chars (swap_buf [i]); |
2509 | } |
2534 | } |
2510 | } |
2535 | } |
2511 | |
2536 | |
2512 | void |
2537 | void ecb_cold |
2513 | rxvt_term::scr_recolour () NOTHROW |
2538 | rxvt_term::scr_recolour (bool refresh) NOTHROW |
2514 | { |
2539 | { |
2515 | #ifdef HAVE_BG_PIXMAP |
2540 | bool transparent = false; |
2516 | bgPixmap.apply (); |
|
|
2517 | #else |
|
|
2518 | |
2541 | |
|
|
2542 | #ifdef HAVE_IMG |
|
|
2543 | if (bg_img != 0) |
|
|
2544 | { |
|
|
2545 | # if ENABLE_TRANSPARENCY |
|
|
2546 | if (bg_flags & BG_IS_TRANSPARENT) |
|
|
2547 | { |
|
|
2548 | XSetWindowBackgroundPixmap (dpy, parent, bg_img->pm); |
|
|
2549 | XSetWindowBackgroundPixmap (dpy, vt, ParentRelative); |
|
|
2550 | |
|
|
2551 | transparent = true; |
|
|
2552 | } |
|
|
2553 | else |
|
|
2554 | # endif |
|
|
2555 | { |
|
|
2556 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
|
|
2557 | XSetWindowBackgroundPixmap (dpy, vt, bg_img->pm); |
|
|
2558 | } |
|
|
2559 | } |
|
|
2560 | else |
|
|
2561 | #endif |
|
|
2562 | { |
2519 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2563 | XSetWindowBackground (dpy, parent, pix_colors[Color_border]); |
2520 | XClearWindow (dpy, parent[0]); |
|
|
2521 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2564 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
|
|
2565 | } |
|
|
2566 | |
|
|
2567 | XClearWindow (dpy, parent); |
2522 | |
2568 | |
2523 | if (scrollBar.win) |
2569 | if (scrollBar.win) |
2524 | { |
2570 | { |
|
|
2571 | if (transparent) |
|
|
2572 | XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative); |
|
|
2573 | else |
2525 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2574 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[scrollBar.color ()]); |
2526 | scrollBar.state = STATE_IDLE; |
2575 | scrollBar.state = SB_STATE_IDLE; |
2527 | scrollBar.show (0); |
2576 | scrollBar.show (0); |
2528 | } |
2577 | } |
2529 | |
2578 | |
2530 | #endif |
2579 | if (refresh) |
2531 | |
2580 | { |
2532 | /* bgPixmap.apply () does not do the following : */ |
|
|
2533 | scr_clear (); |
2581 | scr_clear (); |
2534 | scr_touch (true); |
2582 | scr_touch (true); |
|
|
2583 | } |
2535 | want_refresh = 1; |
2584 | want_refresh = 1; |
2536 | } |
2585 | } |
2537 | |
2586 | |
2538 | /* ------------------------------------------------------------------------- */ |
2587 | /* ------------------------------------------------------------------------- */ |
2539 | void |
2588 | void |
… | |
… | |
2596 | for (rend_t *srp = ROW(row).r; col < end_col; col++) |
2645 | for (rend_t *srp = ROW(row).r; col < end_col; col++) |
2597 | srp[col] ^= rstyle; |
2646 | srp[col] ^= rstyle; |
2598 | } |
2647 | } |
2599 | |
2648 | |
2600 | /* ------------------------------------------------------------------------- */ |
2649 | /* ------------------------------------------------------------------------- */ |
2601 | void |
2650 | void ecb_hot |
2602 | rxvt_term::scr_reverse_selection () NOTHROW |
2651 | rxvt_term::scr_reverse_selection () NOTHROW |
2603 | { |
2652 | { |
2604 | if (selection.op |
2653 | if (selection.op |
2605 | && current_screen == selection.screen |
2654 | && current_screen == selection.screen |
2606 | && selection.end.row >= view_start) |
2655 | && selection.end.row >= view_start) |
… | |
… | |
2625 | */ |
2674 | */ |
2626 | #if 0 |
2675 | #if 0 |
2627 | void |
2676 | void |
2628 | rxvt_term::scr_dump (int fd) NOTHROW |
2677 | rxvt_term::scr_dump (int fd) NOTHROW |
2629 | { |
2678 | { |
2630 | int row, wrote; |
2679 | // if this method is needed, it can be implemented by factoring the |
2631 | unsigned int width, towrite; |
2680 | // relevant code in scr_printscreen |
2632 | char r1[] = "\n"; |
|
|
2633 | |
|
|
2634 | for (row = saveLines + top_row; |
|
|
2635 | row < saveLines + nrow - 1; row++) |
|
|
2636 | { |
|
|
2637 | width = row_buf[row].l >= 0 ? row_buf[row].l |
|
|
2638 | : ncol; |
|
|
2639 | for (towrite = width; towrite; towrite -= wrote) |
|
|
2640 | { |
|
|
2641 | wrote = write (fd, & (row_buf[row].t[width - towrite]), |
|
|
2642 | towrite); |
|
|
2643 | if (wrote < 0) |
|
|
2644 | return; /* XXX: death, no report */ |
|
|
2645 | } |
|
|
2646 | if (row_buf[row].l >= 0) |
|
|
2647 | if (write (fd, r1, 1) <= 0) |
|
|
2648 | return; /* XXX: death, no report */ |
|
|
2649 | } |
|
|
2650 | } |
2681 | } |
2651 | #endif |
2682 | #endif |
2652 | |
2683 | |
2653 | /* ------------------------------------------------------------------------- * |
2684 | /* ------------------------------------------------------------------------- * |
2654 | * CHARACTER SELECTION * |
2685 | * CHARACTER SELECTION * |
2655 | * ------------------------------------------------------------------------- */ |
2686 | * ------------------------------------------------------------------------- */ |
2656 | void |
2687 | void |
2657 | rxvt_term::selection_check (int check_more) NOTHROW |
2688 | rxvt_term::selection_check (int check_more) NOTHROW |
2658 | { |
2689 | { |
2659 | row_col_t pos; |
|
|
2660 | |
|
|
2661 | if (!selection.op) |
2690 | if (!selection.op) |
2662 | return; |
2691 | return; |
2663 | |
2692 | |
2664 | pos.row = pos.col = 0; |
|
|
2665 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2693 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2666 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
2694 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
2667 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2695 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2668 | || (check_more == 1 |
2696 | || (check_more == 1 |
2669 | && current_screen == selection.screen |
2697 | && current_screen == selection.screen |
2670 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2698 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2671 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2699 | && ROWCOL_IS_BEFORE (screen.cur, selection.end))) |
2672 | || (check_more == 2 |
|
|
2673 | && ROWCOL_IS_BEFORE (selection.beg, pos) |
|
|
2674 | && ROWCOL_IS_AFTER (selection.end, pos)) |
|
|
2675 | || (check_more == 3 |
|
|
2676 | && ROWCOL_IS_AFTER (selection.end, pos)) |
|
|
2677 | || (check_more == 4 /* screen width change */ |
|
|
2678 | && (selection.beg.row != selection.end.row |
|
|
2679 | || selection.end.col > ncol))) |
|
|
2680 | CLEAR_SELECTION (); |
2700 | CLEAR_ALL_SELECTION (); |
2681 | } |
2701 | } |
2682 | |
2702 | |
2683 | /* ------------------------------------------------------------------------- */ |
2703 | /* ------------------------------------------------------------------------- */ |
2684 | /* |
2704 | /* |
2685 | * Paste a selection direct to the command fd |
2705 | * Paste a selection direct to the command fd |
… | |
… | |
2691 | for (unsigned int i = 0; i < len; i++) |
2711 | for (unsigned int i = 0; i < len; i++) |
2692 | if (data[i] == C0_LF) |
2712 | if (data[i] == C0_LF) |
2693 | data[i] = C0_CR; |
2713 | data[i] = C0_CR; |
2694 | |
2714 | |
2695 | if (priv_modes & PrivMode_BracketPaste) |
2715 | if (priv_modes & PrivMode_BracketPaste) |
2696 | tt_printf ("\e[200~"); |
2716 | tt_printf ("\x1b[200~"); |
2697 | |
2717 | |
2698 | tt_write (data, len); |
2718 | tt_write (data, len); |
2699 | |
2719 | |
2700 | if (priv_modes & PrivMode_BracketPaste) |
2720 | if (priv_modes & PrivMode_BracketPaste) |
2701 | tt_printf ("\e[201~"); |
2721 | tt_printf ("\x1b[201~"); |
2702 | } |
2722 | } |
2703 | |
2723 | |
2704 | void |
2724 | void |
2705 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2725 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2706 | { |
2726 | { |
… | |
… | |
2710 | tt_paste (data, len); |
2730 | tt_paste (data, len); |
2711 | } |
2731 | } |
2712 | |
2732 | |
2713 | /* ------------------------------------------------------------------------- */ |
2733 | /* ------------------------------------------------------------------------- */ |
2714 | /* |
2734 | /* |
2715 | * Respond to a notification that a primary selection has been sent |
2735 | * Request PRIMARY, SECONDARY or CLIPBOARD selection. |
2716 | * EXT: SelectionNotify |
2736 | * if the requested selection has no owner or is empty CUT_BUFFER0 is used |
2717 | */ |
2737 | * as fallback |
2718 | void |
|
|
2719 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW |
|
|
2720 | { |
|
|
2721 | if (prop == None) /* check for failed XConvertSelection */ |
|
|
2722 | { |
|
|
2723 | if ((selection_type & Sel_CompoundText)) |
|
|
2724 | { |
|
|
2725 | int selnum = selection_type & Sel_whereMask; |
|
|
2726 | |
|
|
2727 | selection_type = 0; |
|
|
2728 | if (selnum != Sel_direct) |
|
|
2729 | selection_request_other (XA_STRING, selnum); |
|
|
2730 | } |
|
|
2731 | |
|
|
2732 | if ((selection_type & Sel_UTF8String)) |
|
|
2733 | { |
|
|
2734 | int selnum = selection_type & Sel_whereMask; |
|
|
2735 | |
|
|
2736 | selection_type = Sel_CompoundText; |
|
|
2737 | if (selnum != Sel_direct) |
|
|
2738 | selection_request_other (xa[XA_COMPOUND_TEXT], selnum); |
|
|
2739 | else |
|
|
2740 | selection_type = 0; |
|
|
2741 | } |
|
|
2742 | |
|
|
2743 | return; |
|
|
2744 | } |
|
|
2745 | |
|
|
2746 | unsigned long bytes_after; |
|
|
2747 | XTextProperty ct; |
|
|
2748 | |
|
|
2749 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2750 | 0, PROP_SIZE / 4, |
|
|
2751 | delete_prop, AnyPropertyType, |
|
|
2752 | &ct.encoding, &ct.format, |
|
|
2753 | &ct.nitems, &bytes_after, |
|
|
2754 | &ct.value) != Success) |
|
|
2755 | { |
|
|
2756 | ct.value = 0; |
|
|
2757 | goto bailout; |
|
|
2758 | } |
|
|
2759 | |
|
|
2760 | if (ct.encoding == None) |
|
|
2761 | goto bailout; |
|
|
2762 | |
|
|
2763 | if (bytes_after) |
|
|
2764 | { |
|
|
2765 | // fetch and append remaining data |
|
|
2766 | XTextProperty ct2; |
|
|
2767 | |
|
|
2768 | if (XGetWindowProperty (dpy, win, prop, |
|
|
2769 | ct.nitems / 4, (bytes_after + 3) / 4, |
|
|
2770 | delete_prop, AnyPropertyType, |
|
|
2771 | &ct2.encoding, &ct2.format, |
|
|
2772 | &ct2.nitems, &bytes_after, |
|
|
2773 | &ct2.value) != Success) |
|
|
2774 | goto bailout; |
|
|
2775 | |
|
|
2776 | // realloc should be compatible to XFree, here, and elsewhere, too |
|
|
2777 | ct.value = (unsigned char *)realloc (ct.value, ct.nitems + ct2.nitems + 1); |
|
|
2778 | memcpy (ct.value + ct.nitems, ct2.value, ct2.nitems + 1); |
|
|
2779 | ct.nitems += ct2.nitems; |
|
|
2780 | |
|
|
2781 | XFree (ct2.value); |
|
|
2782 | } |
|
|
2783 | |
|
|
2784 | if (ct.value == 0) |
|
|
2785 | goto bailout; |
|
|
2786 | |
|
|
2787 | if (ct.encoding == xa[XA_INCR]) |
|
|
2788 | { |
|
|
2789 | // INCR selection, start handshake |
|
|
2790 | if (!delete_prop) |
|
|
2791 | XDeleteProperty (dpy, win, prop); |
|
|
2792 | |
|
|
2793 | selection_wait = Sel_incr; |
|
|
2794 | incr_buf_fill = 0; |
|
|
2795 | incr_ev.start (10); |
|
|
2796 | |
|
|
2797 | goto bailout; |
|
|
2798 | } |
|
|
2799 | |
|
|
2800 | if (ct.nitems == 0) |
|
|
2801 | { |
|
|
2802 | if (selection_wait == Sel_incr) |
|
|
2803 | { |
|
|
2804 | XFree (ct.value); |
|
|
2805 | |
|
|
2806 | // finally complete, now paste the whole thing |
|
|
2807 | selection_wait = Sel_normal; |
|
|
2808 | ct.value = (unsigned char *)incr_buf; |
|
|
2809 | ct.nitems = incr_buf_fill; |
|
|
2810 | incr_buf = 0; |
|
|
2811 | incr_buf_size = 0; |
|
|
2812 | incr_ev.stop (); |
|
|
2813 | } |
|
|
2814 | else |
|
|
2815 | { |
|
|
2816 | if (selection_wait == Sel_normal |
|
|
2817 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
|
|
2818 | { |
|
|
2819 | /* |
|
|
2820 | * pass through again trying CUT_BUFFER0 if we've come from |
|
|
2821 | * XConvertSelection () but nothing was presented |
|
|
2822 | */ |
|
|
2823 | selection_paste (display->root, XA_CUT_BUFFER0, False); |
|
|
2824 | } |
|
|
2825 | |
|
|
2826 | goto bailout; |
|
|
2827 | } |
|
|
2828 | } |
|
|
2829 | else if (selection_wait == Sel_incr) |
|
|
2830 | { |
|
|
2831 | incr_ev.start (10); |
|
|
2832 | |
|
|
2833 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
|
|
2834 | { |
|
|
2835 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
|
|
2836 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
|
|
2837 | } |
|
|
2838 | |
|
|
2839 | memcpy (incr_buf + incr_buf_fill, ct.value, ct.nitems); |
|
|
2840 | incr_buf_fill += ct.nitems; |
|
|
2841 | |
|
|
2842 | goto bailout; |
|
|
2843 | } |
|
|
2844 | |
|
|
2845 | char **cl; |
|
|
2846 | int cr; |
|
|
2847 | |
|
|
2848 | #if !ENABLE_MINIMAL |
|
|
2849 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
|
|
2850 | // so recode it manually |
|
|
2851 | if (ct.encoding == xa[XA_UTF8_STRING]) |
|
|
2852 | { |
|
|
2853 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
|
|
2854 | char *s = rxvt_wcstombs (w); |
|
|
2855 | free (w); |
|
|
2856 | // TODO: strlen == only the first element will be converted. well... |
|
|
2857 | paste (s, strlen (s)); |
|
|
2858 | free (s); |
|
|
2859 | } |
|
|
2860 | else |
|
|
2861 | #endif |
|
|
2862 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
|
|
2863 | && cl) |
|
|
2864 | { |
|
|
2865 | for (int i = 0; i < cr; i++) |
|
|
2866 | paste (cl[i], strlen (cl[i])); |
|
|
2867 | |
|
|
2868 | XFreeStringList (cl); |
|
|
2869 | } |
|
|
2870 | else |
|
|
2871 | paste ((char *)ct.value, ct.nitems); // paste raw |
|
|
2872 | |
|
|
2873 | bailout: |
|
|
2874 | XFree (ct.value); |
|
|
2875 | |
|
|
2876 | if (selection_wait == Sel_normal) |
|
|
2877 | selection_wait = Sel_none; |
|
|
2878 | } |
|
|
2879 | |
|
|
2880 | void |
|
|
2881 | rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW |
|
|
2882 | { |
|
|
2883 | selection_wait = Sel_none; |
|
|
2884 | |
|
|
2885 | incr_buf_size = 0; |
|
|
2886 | free (incr_buf); |
|
|
2887 | |
|
|
2888 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
|
|
2889 | } |
|
|
2890 | |
|
|
2891 | void |
|
|
2892 | rxvt_term::selection_property (Window win, Atom prop) NOTHROW |
|
|
2893 | { |
|
|
2894 | if (prop == None || selection_wait != Sel_incr) |
|
|
2895 | return; |
|
|
2896 | |
|
|
2897 | selection_paste (win, prop, true); |
|
|
2898 | } |
|
|
2899 | |
|
|
2900 | /* ------------------------------------------------------------------------- */ |
|
|
2901 | /* |
|
|
2902 | * Request the current selection: |
|
|
2903 | * Order: > internal selection if available |
|
|
2904 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
|
|
2905 | * > CUT_BUFFER0 |
|
|
2906 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
|
|
2907 | * will auto fallback to CUT_BUFFER0 |
|
|
2908 | * EXT: button 2 release |
2738 | * EXT: button 2 release |
2909 | */ |
2739 | */ |
2910 | void |
2740 | void |
2911 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2741 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2912 | { |
2742 | { |
2913 | if (selection.text && selnum == Sel_Primary) |
2743 | if (!selection_req) |
2914 | { |
|
|
2915 | /* internal selection */ |
|
|
2916 | char *str = rxvt_wcstombs (selection.text, selection.len); |
|
|
2917 | paste (str, strlen (str)); |
|
|
2918 | free (str); |
|
|
2919 | return; |
|
|
2920 | } |
2744 | { |
2921 | else |
2745 | selection_req = new rxvt_selection (display, selnum, tm, vt, xa[XA_VT_SELECTION], this); |
|
|
2746 | selection_req->run (); |
2922 | { |
2747 | } |
2923 | selection_request_time = tm; |
|
|
2924 | selection_wait = Sel_normal; |
|
|
2925 | |
|
|
2926 | #if X_HAVE_UTF8_STRING |
|
|
2927 | selection_type = Sel_UTF8String; |
|
|
2928 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
|
|
2929 | return; |
|
|
2930 | #else |
|
|
2931 | selection_type = Sel_CompoundText; |
|
|
2932 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
|
|
2933 | return; |
|
|
2934 | #endif |
|
|
2935 | } |
|
|
2936 | |
|
|
2937 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
|
|
2938 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
|
|
2939 | } |
|
|
2940 | |
|
|
2941 | int |
|
|
2942 | rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW |
|
|
2943 | { |
|
|
2944 | Atom sel; |
|
|
2945 | |
|
|
2946 | selection_type |= selnum; |
|
|
2947 | |
|
|
2948 | if (selnum == Sel_Primary) |
|
|
2949 | sel = XA_PRIMARY; |
|
|
2950 | else if (selnum == Sel_Secondary) |
|
|
2951 | sel = XA_SECONDARY; |
|
|
2952 | else |
|
|
2953 | sel = xa[XA_CLIPBOARD]; |
|
|
2954 | |
|
|
2955 | if (XGetSelectionOwner (dpy, sel) != None) |
|
|
2956 | { |
|
|
2957 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
|
|
2958 | vt, selection_request_time); |
|
|
2959 | return 1; |
|
|
2960 | } |
|
|
2961 | |
|
|
2962 | return 0; |
|
|
2963 | } |
2748 | } |
2964 | |
2749 | |
2965 | /* ------------------------------------------------------------------------- */ |
2750 | /* ------------------------------------------------------------------------- */ |
2966 | /* |
2751 | /* |
2967 | * Clear all selected text |
2752 | * Clear all selected text |
… | |
… | |
2998 | * EXT: button 1 or 3 release |
2783 | * EXT: button 1 or 3 release |
2999 | */ |
2784 | */ |
3000 | void |
2785 | void |
3001 | rxvt_term::selection_make (Time tm) |
2786 | rxvt_term::selection_make (Time tm) |
3002 | { |
2787 | { |
3003 | int i; |
2788 | int size; |
3004 | wchar_t *new_selection_text; |
2789 | wchar_t *new_selection_text; |
3005 | text_t *t; |
2790 | text_t *t; |
3006 | |
2791 | |
3007 | switch (selection.op) |
2792 | switch (selection.op) |
3008 | { |
2793 | { |
… | |
… | |
3024 | return; /* nothing selected, go away */ |
2809 | return; /* nothing selected, go away */ |
3025 | |
2810 | |
3026 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
2811 | if (HOOK_INVOKE ((this, HOOK_SEL_MAKE, DT_LONG, (long)tm, DT_END))) |
3027 | return; |
2812 | return; |
3028 | |
2813 | |
3029 | i = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
2814 | size = (selection.end.row - selection.beg.row + 1) * (ncol + 1); |
3030 | new_selection_text = (wchar_t *)rxvt_malloc ((i + 4) * sizeof (wchar_t)); |
2815 | new_selection_text = (wchar_t *)rxvt_malloc ((size + 4) * sizeof (wchar_t)); |
3031 | |
2816 | |
3032 | int ofs = 0; |
2817 | int ofs = 0; |
3033 | int extra = 0; |
2818 | int extra = 0; |
3034 | |
2819 | |
3035 | int col = selection.beg.col; |
2820 | int col = selection.beg.col; |
… | |
… | |
3041 | { |
2826 | { |
3042 | #if !ENABLE_MINIMAL |
2827 | #if !ENABLE_MINIMAL |
3043 | if (selection.rect) |
2828 | if (selection.rect) |
3044 | { |
2829 | { |
3045 | col = selection.beg.col; |
2830 | col = selection.beg.col; |
3046 | end_col = ncol + 1; |
2831 | end_col = selection.end.col; |
3047 | } |
2832 | } |
3048 | else |
2833 | else |
3049 | #endif |
2834 | #endif |
3050 | end_col = ROW(row).l; |
2835 | end_col = ROW(row).l; |
3051 | |
2836 | |
3052 | col = max (col, 0); |
2837 | col = max (col, 0); |
3053 | |
2838 | |
3054 | if (row == selection.end.row |
2839 | if (row == selection.end.row) |
3055 | #if !ENABLE_MINIMAL |
|
|
3056 | || selection.rect |
|
|
3057 | #endif |
|
|
3058 | ) |
|
|
3059 | min_it (end_col, selection.end.col); |
2840 | min_it (end_col, selection.end.col); |
3060 | |
2841 | |
3061 | t = ROW(row).t + col; |
2842 | t = ROW(row).t + col; |
3062 | |
2843 | |
3063 | for (; col < end_col; col++) |
2844 | for (; col < end_col; col++) |
… | |
… | |
3071 | |
2852 | |
3072 | extra -= (len - 1); |
2853 | extra -= (len - 1); |
3073 | |
2854 | |
3074 | if (extra < 0) |
2855 | if (extra < 0) |
3075 | { |
2856 | { |
3076 | extra += i; |
2857 | extra += size; |
3077 | i += i; |
2858 | size += size; |
3078 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (i + 4) * sizeof (wchar_t)); |
2859 | new_selection_text = (wchar_t *)rxvt_realloc (new_selection_text, (size + 4) * sizeof (wchar_t)); |
3079 | } |
2860 | } |
3080 | |
2861 | |
3081 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
2862 | ofs += rxvt_composite.expand (*t++, new_selection_text + ofs); |
3082 | } |
2863 | } |
3083 | #endif |
2864 | #endif |
… | |
… | |
3095 | |
2876 | |
3096 | new_selection_text[ofs++] = C0_LF; |
2877 | new_selection_text[ofs++] = C0_LF; |
3097 | } |
2878 | } |
3098 | else |
2879 | else |
3099 | #endif |
2880 | #endif |
3100 | if (!ROW(row).is_longer () && row != selection.end.row) |
2881 | if (!ROW(row).is_longer () |
|
|
2882 | && (row != selection.end.row || end_col != selection.end.col) |
|
|
2883 | && (row != selection.beg.row || selection.beg.col < ncol)) |
3101 | new_selection_text[ofs++] = C0_LF; |
2884 | new_selection_text[ofs++] = C0_LF; |
3102 | } |
2885 | } |
3103 | |
|
|
3104 | if (end_col != selection.end.col) |
|
|
3105 | new_selection_text[ofs++] = C0_LF; |
|
|
3106 | |
2886 | |
3107 | new_selection_text[ofs] = 0; |
2887 | new_selection_text[ofs] = 0; |
3108 | |
2888 | |
3109 | if (ofs == 0) |
2889 | if (ofs == 0) |
3110 | { |
2890 | { |
… | |
… | |
3166 | /* ------------------------------------------------------------------------- */ |
2946 | /* ------------------------------------------------------------------------- */ |
3167 | /* |
2947 | /* |
3168 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
2948 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
3169 | * EXT: button 1 press |
2949 | * EXT: button 1 press |
3170 | */ |
2950 | */ |
3171 | void |
2951 | void ecb_cold |
3172 | rxvt_term::selection_click (int clicks, int x, int y) NOTHROW |
2952 | rxvt_term::selection_click (int clicks, int x, int y) NOTHROW |
3173 | { |
2953 | { |
3174 | clicks = ((clicks - 1) % 3) + 1; |
2954 | clicks = ((clicks - 1) % 3) + 1; |
3175 | selection.clicks = clicks; /* save clicks so extend will work */ |
2955 | selection.clicks = clicks; /* save clicks so extend will work */ |
3176 | |
2956 | |
… | |
… | |
3195 | |
2975 | |
3196 | /* ------------------------------------------------------------------------- */ |
2976 | /* ------------------------------------------------------------------------- */ |
3197 | /* |
2977 | /* |
3198 | * Mark a selection at the specified col/row |
2978 | * Mark a selection at the specified col/row |
3199 | */ |
2979 | */ |
3200 | void |
2980 | void ecb_cold |
3201 | rxvt_term::selection_start_colrow (int col, int row) NOTHROW |
2981 | rxvt_term::selection_start_colrow (int col, int row) NOTHROW |
3202 | { |
2982 | { |
3203 | want_refresh = 1; |
2983 | want_refresh = 1; |
3204 | |
2984 | |
3205 | selection.mark.row = row + view_start; |
2985 | selection.mark.row = row + view_start; |
… | |
… | |
3232 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
3012 | /* what do we want: spaces/tabs are delimiters or cutchars or non-cutchars */ |
3233 | #define DELIMIT_TEXT(x) \ |
3013 | #define DELIMIT_TEXT(x) \ |
3234 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
3014 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
3235 | #define DELIMIT_REND(x) 1 |
3015 | #define DELIMIT_REND(x) 1 |
3236 | |
3016 | |
3237 | void |
3017 | void ecb_cold |
3238 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW |
3018 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW |
3239 | { |
3019 | { |
3240 | int col, row, dirnadd, tcol, trow, w1, w2; |
3020 | int col, row, dirnadd, tcol, trow, w1, w2; |
3241 | row_col_t bound; |
3021 | row_col_t bound; |
3242 | text_t *stp; |
3022 | text_t *stp; |
… | |
… | |
3316 | * EXT: button 3 press; button 1 or 3 drag |
3096 | * EXT: button 3 press; button 1 or 3 drag |
3317 | * flag == 0 ==> button 1 |
3097 | * flag == 0 ==> button 1 |
3318 | * flag == 1 ==> button 3 press |
3098 | * flag == 1 ==> button 3 press |
3319 | * flag == 2 ==> button 3 motion |
3099 | * flag == 2 ==> button 3 motion |
3320 | */ |
3100 | */ |
3321 | void |
3101 | void ecb_cold |
3322 | rxvt_term::selection_extend (int x, int y, int flag) NOTHROW |
3102 | rxvt_term::selection_extend (int x, int y, int flag) NOTHROW |
3323 | { |
3103 | { |
3324 | int col = clamp (Pixel2Col (x), 0, ncol); |
3104 | int col = clamp (Pixel2Col (x), 0, ncol); |
3325 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3105 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3326 | |
3106 | |
… | |
… | |
3352 | |
3132 | |
3353 | /* ------------------------------------------------------------------------- */ |
3133 | /* ------------------------------------------------------------------------- */ |
3354 | /* |
3134 | /* |
3355 | * Extend the selection to the specified col/row |
3135 | * Extend the selection to the specified col/row |
3356 | */ |
3136 | */ |
3357 | void |
3137 | void ecb_cold |
3358 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW |
3138 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW |
3359 | { |
3139 | { |
3360 | row_col_t pos; |
3140 | row_col_t pos; |
3361 | enum { |
3141 | enum { |
3362 | LEFT, RIGHT |
3142 | LEFT, RIGHT |
… | |
… | |
3553 | ::swap (selection.beg.col, selection.end.col); |
3333 | ::swap (selection.beg.col, selection.end.col); |
3554 | #endif |
3334 | #endif |
3555 | } |
3335 | } |
3556 | |
3336 | |
3557 | #if !ENABLE_MINIMAL |
3337 | #if !ENABLE_MINIMAL |
3558 | void |
3338 | void ecb_cold |
3559 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3339 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3560 | { |
3340 | { |
3561 | int32_t end_col, end_row; |
3341 | int32_t end_col, end_row; |
3562 | text_t *stp; |
3342 | text_t *stp; |
3563 | |
3343 | |
… | |
… | |
3601 | /* ------------------------------------------------------------------------- */ |
3381 | /* ------------------------------------------------------------------------- */ |
3602 | /* |
3382 | /* |
3603 | * Double click on button 3 when already selected |
3383 | * Double click on button 3 when already selected |
3604 | * EXT: button 3 double click |
3384 | * EXT: button 3 double click |
3605 | */ |
3385 | */ |
3606 | void |
3386 | void ecb_cold |
3607 | rxvt_term::selection_rotate (int x, int y) NOTHROW |
3387 | rxvt_term::selection_rotate (int x, int y) NOTHROW |
3608 | { |
3388 | { |
3609 | selection.clicks = selection.clicks % 3 + 1; |
3389 | selection.clicks = selection.clicks % 3 + 1; |
3610 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3390 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3611 | } |
3391 | } |
… | |
… | |
3613 | /* ------------------------------------------------------------------------- */ |
3393 | /* ------------------------------------------------------------------------- */ |
3614 | /* |
3394 | /* |
3615 | * Respond to a request for our current selection |
3395 | * Respond to a request for our current selection |
3616 | * EXT: SelectionRequest |
3396 | * EXT: SelectionRequest |
3617 | */ |
3397 | */ |
3618 | void |
3398 | void ecb_cold |
3619 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3399 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3620 | { |
3400 | { |
|
|
3401 | Atom property = rq.property == None ? rq.target : rq.property; |
3621 | XSelectionEvent ev; |
3402 | XSelectionEvent ev; |
3622 | |
3403 | |
3623 | ev.type = SelectionNotify; |
3404 | ev.type = SelectionNotify; |
3624 | ev.property = None; |
3405 | ev.property = None; |
3625 | ev.display = rq.display; |
3406 | ev.display = rq.display; |
… | |
… | |
3640 | *target++ = xa[XA_COMPOUND_TEXT]; |
3421 | *target++ = xa[XA_COMPOUND_TEXT]; |
3641 | #if X_HAVE_UTF8_STRING |
3422 | #if X_HAVE_UTF8_STRING |
3642 | *target++ = xa[XA_UTF8_STRING]; |
3423 | *target++ = xa[XA_UTF8_STRING]; |
3643 | #endif |
3424 | #endif |
3644 | |
3425 | |
3645 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3426 | XChangeProperty (dpy, rq.requestor, property, XA_ATOM, |
3646 | 32, PropModeReplace, |
3427 | 32, PropModeReplace, |
3647 | (unsigned char *)target_list, target - target_list); |
3428 | (unsigned char *)target_list, target - target_list); |
3648 | ev.property = rq.property; |
3429 | ev.property = property; |
3649 | } |
3430 | } |
3650 | #if TODO // TODO |
3431 | #if TODO // TODO |
3651 | else if (rq.target == xa[XA_MULTIPLE]) |
3432 | else if (rq.target == xa[XA_MULTIPLE]) |
3652 | { |
3433 | { |
3653 | /* TODO: Handle MULTIPLE */ |
3434 | /* TODO: Handle MULTIPLE */ |
3654 | } |
3435 | } |
3655 | #endif |
3436 | #endif |
3656 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3437 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == XA_PRIMARY && selection.text) |
3657 | { |
3438 | { |
3658 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3439 | XChangeProperty (dpy, rq.requestor, property, rq.target, |
3659 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3440 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3660 | ev.property = rq.property; |
3441 | ev.property = property; |
3661 | } |
3442 | } |
3662 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
3443 | else if (rq.target == xa[XA_TIMESTAMP] && rq.selection == xa[XA_CLIPBOARD] && selection.clip_text) |
3663 | { |
3444 | { |
3664 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3445 | XChangeProperty (dpy, rq.requestor, property, rq.target, |
3665 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3446 | 32, PropModeReplace, (unsigned char *)&clipboard_time, 1); |
3666 | ev.property = rq.property; |
3447 | ev.property = property; |
3667 | } |
3448 | } |
3668 | else if (rq.target == XA_STRING |
3449 | else if (rq.target == XA_STRING |
3669 | || rq.target == xa[XA_TEXT] |
3450 | || rq.target == xa[XA_TEXT] |
3670 | || rq.target == xa[XA_COMPOUND_TEXT] |
3451 | || rq.target == xa[XA_COMPOUND_TEXT] |
3671 | || rq.target == xa[XA_UTF8_STRING] |
3452 | || rq.target == xa[XA_UTF8_STRING] |
… | |
… | |
3742 | ct.value = (unsigned char *)cl; |
3523 | ct.value = (unsigned char *)cl; |
3743 | ct.nitems = selectlen; |
3524 | ct.nitems = selectlen; |
3744 | ct.encoding = target; |
3525 | ct.encoding = target; |
3745 | } |
3526 | } |
3746 | |
3527 | |
3747 | XChangeProperty (dpy, rq.requestor, rq.property, |
3528 | XChangeProperty (dpy, rq.requestor, property, |
3748 | ct.encoding, 8, PropModeReplace, |
3529 | ct.encoding, 8, PropModeReplace, |
3749 | ct.value, (int)ct.nitems); |
3530 | ct.value, (int)ct.nitems); |
3750 | ev.property = rq.property; |
3531 | ev.property = property; |
3751 | |
3532 | |
3752 | if (freect) |
3533 | if (freect) |
3753 | XFree (ct.value); |
3534 | XFree (ct.value); |
3754 | } |
3535 | } |
3755 | |
3536 | |
3756 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3537 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3757 | } |
3538 | } |
3758 | |
3539 | |
3759 | /* ------------------------------------------------------------------------- */ |
3540 | /* ------------------------------------------------------------------------- */ |
3760 | #ifdef USE_XIM |
3541 | #if USE_XIM |
3761 | void |
3542 | void ecb_cold |
3762 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3543 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3763 | { |
3544 | { |
3764 | XWindowAttributes xwa; |
3545 | XWindowAttributes xwa; |
3765 | |
3546 | |
3766 | XGetWindowAttributes (dpy, vt, &xwa); |
3547 | XGetWindowAttributes (dpy, vt, &xwa); |