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-2006 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. |
… | |
… | |
26 | |
26 | |
27 | #include "../config.h" /* NECESSARY */ |
27 | #include "../config.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
28 | #include "rxvt.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
29 | #include "rxvtperl.h" /* NECESSARY */ |
30 | |
30 | |
31 | #include <X11/Xmd.h> /* get the typedef for CARD32 */ |
|
|
32 | |
|
|
33 | #include <inttypes.h> |
31 | #include <inttypes.h> |
34 | |
32 | |
35 | #include "salloc.C" // HACK, should be a seperate compile! |
33 | #include "salloc.C" // HACK, should be a seperate compile! |
36 | |
34 | |
37 | inline void fill_text (text_t *start, text_t value, int len) |
35 | static inline void fill_text (text_t *start, text_t value, int len) |
38 | { |
36 | { |
39 | while (len--) |
37 | while (len--) |
40 | *start++ = value; |
38 | *start++ = value; |
41 | } |
39 | } |
42 | |
40 | |
… | |
… | |
47 | |
45 | |
48 | /* ------------------------------------------------------------------------- * |
46 | /* ------------------------------------------------------------------------- * |
49 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
47 | * GENERAL SCREEN AND SELECTION UPDATE ROUTINES * |
50 | * ------------------------------------------------------------------------- */ |
48 | * ------------------------------------------------------------------------- */ |
51 | #define ZERO_SCROLLBACK() \ |
49 | #define ZERO_SCROLLBACK() \ |
52 | if (OPTION (Opt_scrollTtyOutput)) \ |
50 | if (option (Opt_scrollTtyOutput)) \ |
53 | view_start = 0 |
51 | view_start = 0 |
54 | #define CLEAR_SELECTION() \ |
52 | #define CLEAR_SELECTION() \ |
55 | selection.beg.row = selection.beg.col \ |
53 | selection.beg.row = selection.beg.col \ |
56 | = selection.end.row = selection.end.col = 0 |
54 | = selection.end.row = selection.end.col = 0 |
57 | #define CLEAR_ALL_SELECTION() \ |
55 | #define CLEAR_ALL_SELECTION() \ |
… | |
… | |
85 | 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) |
86 | #define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ |
84 | #define ROWCOL_IN_ROW_AT_OR_BEFORE(X, Y) \ |
87 | 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) |
88 | |
86 | |
89 | /* |
87 | /* |
90 | * CLEAR_ROWS : clear <num> rows starting from row <row> |
|
|
91 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
88 | * CLEAR_CHARS: clear <num> chars starting from pixel position <x,y> |
92 | * ERASE_ROWS : set <num> rows starting from row <row> to the foreground colour |
|
|
93 | */ |
89 | */ |
94 | #define drawBuffer vt |
|
|
95 | |
|
|
96 | #define CLEAR_ROWS(row, num) \ |
|
|
97 | if (mapped) \ |
|
|
98 | XClearArea (display->display, drawBuffer, 0, \ |
|
|
99 | Row2Pixel (row), (unsigned int)width, \ |
|
|
100 | (unsigned int)Height2Pixel (num), False) |
|
|
101 | |
|
|
102 | #define CLEAR_CHARS(x, y, num) \ |
90 | #define CLEAR_CHARS(x, y, num) \ |
103 | if (mapped) \ |
91 | if (mapped) \ |
104 | XClearArea (display->display, drawBuffer, x, y, \ |
92 | XClearArea (dpy, vt, x, y, \ |
105 | (unsigned int)Width2Pixel (num), \ |
93 | (unsigned int)Width2Pixel (num), \ |
106 | (unsigned int)Height2Pixel (1), False) |
94 | (unsigned int)Height2Pixel (1), False) |
107 | |
|
|
108 | #define ERASE_ROWS(row, num) \ |
|
|
109 | XFillRectangle (display->display, drawBuffer, gc, \ |
|
|
110 | 0, Row2Pixel (row), \ |
|
|
111 | (unsigned int)width, \ |
|
|
112 | (unsigned int)Height2Pixel (num)) |
|
|
113 | |
95 | |
114 | /* ------------------------------------------------------------------------- * |
96 | /* ------------------------------------------------------------------------- * |
115 | * SCREEN `COMMON' ROUTINES * |
97 | * SCREEN `COMMON' ROUTINES * |
116 | * ------------------------------------------------------------------------- */ |
98 | * ------------------------------------------------------------------------- */ |
117 | |
99 | |
… | |
… | |
126 | width = ncol; |
108 | width = ncol; |
127 | } |
109 | } |
128 | |
110 | |
129 | l.touch (); |
111 | l.touch (); |
130 | |
112 | |
131 | efs &= ~RS_baseattrMask; |
113 | efs &= ~RS_baseattrMask; // remove italic etc. fontstyles |
132 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
114 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
133 | |
115 | |
134 | text_t *et = l.t + col; |
116 | text_t *et = l.t + col; |
135 | rend_t *er = l.r + col; |
117 | rend_t *er = l.r + col; |
136 | |
118 | |
… | |
… | |
161 | { |
143 | { |
162 | #if ENABLE_OVERLAY |
144 | #if ENABLE_OVERLAY |
163 | scr_overlay_off (); |
145 | scr_overlay_off (); |
164 | #endif |
146 | #endif |
165 | |
147 | |
|
|
148 | rvideo_mode = false; |
166 | view_start = 0; |
149 | view_start = 0; |
167 | num_scr = 0; |
150 | num_scr = 0; |
168 | |
151 | |
169 | if (ncol == 0) |
152 | if (ncol == 0) |
170 | ncol = 80; |
153 | ncol = 80; |
… | |
… | |
173 | nrow = 24; |
156 | nrow = 24; |
174 | |
157 | |
175 | if (ncol == prev_ncol && nrow == prev_nrow) |
158 | if (ncol == prev_ncol && nrow == prev_nrow) |
176 | return; |
159 | return; |
177 | |
160 | |
|
|
161 | if (current_screen != PRIMARY) |
|
|
162 | scr_swap_screen (); |
|
|
163 | |
178 | // we need at least two lines for wrapping to work correctly |
164 | // we need at least two lines for wrapping to work correctly |
179 | if (nrow + saveLines < 2) |
165 | while (nrow + saveLines < 2) |
180 | { |
166 | { |
181 | //TODO//FIXME |
167 | //TODO//FIXME |
182 | saveLines++; |
168 | saveLines++; |
183 | prev_nrow--; |
169 | prev_nrow--; |
184 | top_row--; |
170 | top_row--; |
… | |
… | |
195 | if (!row_buf) |
181 | if (!row_buf) |
196 | { |
182 | { |
197 | /* |
183 | /* |
198 | * first time called so just malloc everything: don't rely on realloc |
184 | * first time called so just malloc everything: don't rely on realloc |
199 | */ |
185 | */ |
200 | top_row = 0; /* no saved lines */ |
186 | top_row = 0; |
201 | term_start = 0; |
187 | term_start = 0; |
202 | |
188 | |
203 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
189 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
204 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
190 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
205 | |
191 | |
… | |
… | |
234 | selection.text = NULL; |
220 | selection.text = NULL; |
235 | selection.len = 0; |
221 | selection.len = 0; |
236 | selection.op = SELECTION_CLEAR; |
222 | selection.op = SELECTION_CLEAR; |
237 | selection.screen = PRIMARY; |
223 | selection.screen = PRIMARY; |
238 | selection.clicks = 0; |
224 | selection.clicks = 0; |
239 | rvideo_state = rvideo_mode = false; |
|
|
240 | } |
225 | } |
241 | else |
226 | else |
242 | { |
227 | { |
243 | /* |
228 | /* |
244 | * add or delete rows as appropriate |
229 | * add or delete rows as appropriate |
… | |
… | |
273 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
258 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
274 | } |
259 | } |
275 | |
260 | |
276 | line_t *old_buf = row_buf; |
261 | line_t *old_buf = row_buf; |
277 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
262 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
278 | |
263 | |
279 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
264 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
280 | int pend = MOD (term_start + top_row , prev_total_rows); |
265 | int pend = MOD (term_start + top_row , prev_total_rows); |
281 | int q = total_rows; // rewrapped row |
266 | int q = total_rows; // rewrapped row |
282 | |
267 | |
283 | if (top_row) |
268 | if (top_row) |
284 | { |
269 | { |
285 | // re-wrap lines, this is rather ugly, possibly because I am too dumb |
270 | // Re-wrap lines. This is rather ugly, possibly because I am too dumb |
286 | // to come up with a lean and mean algorithm. |
271 | // to come up with a lean and mean algorithm. |
287 | |
272 | |
288 | row_col_t ocur = screen.cur; |
273 | row_col_t ocur = screen.cur; |
289 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
274 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
290 | |
275 | |
… | |
… | |
327 | int qcol = 0; |
312 | int qcol = 0; |
328 | |
313 | |
329 | // see below for cursor adjustment rationale |
314 | // see below for cursor adjustment rationale |
330 | if (p == ocur.row) |
315 | if (p == ocur.row) |
331 | screen.cur.row = q - (total_rows - nrow); |
316 | screen.cur.row = q - (total_rows - nrow); |
332 | |
317 | |
333 | // fill a single destination line |
318 | // fill a single destination line |
334 | while (lofs < llen && qcol < ncol) |
319 | while (lofs < llen && qcol < ncol) |
335 | { |
320 | { |
336 | int prow = lofs / prev_ncol; |
321 | int prow = lofs / prev_ncol; |
337 | int pcol = lofs % prev_ncol; |
322 | int pcol = lofs % prev_ncol; |
… | |
… | |
347 | |
332 | |
348 | line_t &pline = old_buf [prow]; |
333 | line_t &pline = old_buf [prow]; |
349 | |
334 | |
350 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
335 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
351 | |
336 | |
352 | #if DEBUG_STRICT |
|
|
353 | assert (len); |
|
|
354 | assert (pline.t); |
|
|
355 | #endif |
|
|
356 | |
|
|
357 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
337 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
358 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
338 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
359 | |
339 | |
360 | lofs += len; |
340 | lofs += len; |
361 | qcol += len; |
341 | qcol += len; |
… | |
… | |
368 | } |
348 | } |
369 | while (p != pend && q > 0); |
349 | while (p != pend && q > 0); |
370 | |
350 | |
371 | term_start = total_rows - nrow; |
351 | term_start = total_rows - nrow; |
372 | top_row = q - term_start; |
352 | top_row = q - term_start; |
373 | |
353 | |
374 | // make sure all terminal lines exist |
354 | // make sure all terminal lines exist |
375 | while (top_row > 0) |
355 | while (top_row > 0) |
376 | scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); |
356 | scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); |
377 | } |
357 | } |
378 | else |
358 | else |
379 | { |
359 | { |
380 | // if no scrollback exists (yet), wing, instead of wrap |
360 | // if no scrollback exists (yet), wing, instead of wrap |
381 | |
361 | |
382 | for (int row = min (nrow, prev_nrow); row--; ) |
362 | for (int row = min (nrow, prev_nrow); row--; ) |
383 | { |
363 | { |
384 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
364 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
385 | line_t &qline = row_buf [row]; |
365 | line_t &qline = row_buf [row]; |
386 | |
366 | |
… | |
… | |
401 | delete old_ra; |
381 | delete old_ra; |
402 | |
382 | |
403 | clamp_it (screen.cur.row, 0, nrow - 1); |
383 | clamp_it (screen.cur.row, 0, nrow - 1); |
404 | clamp_it (screen.cur.col, 0, ncol - 1); |
384 | clamp_it (screen.cur.col, 0, ncol - 1); |
405 | |
385 | |
406 | if (tabs) |
|
|
407 | free (tabs); |
386 | free (tabs); |
408 | } |
387 | } |
409 | |
388 | |
410 | CLEAR_ALL_SELECTION (); |
389 | CLEAR_ALL_SELECTION (); |
411 | |
390 | |
412 | prev_nrow = nrow; |
391 | prev_nrow = nrow; |
413 | prev_ncol = ncol; |
392 | prev_ncol = ncol; |
414 | |
393 | |
415 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
394 | tabs = (char *)rxvt_malloc (ncol); |
416 | |
395 | |
417 | for (int col = ncol; col--; ) |
396 | for (int col = ncol; --col; ) |
418 | tabs [col] = col % TABSIZE == 0; |
397 | tabs [col] = col % TABSIZE == 0; |
419 | |
398 | |
|
|
399 | if (current_screen != PRIMARY) |
|
|
400 | scr_swap_screen (); |
|
|
401 | |
420 | tt_winch (); |
402 | tt_winch (); |
421 | |
403 | |
422 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
404 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
423 | } |
405 | } |
424 | |
406 | |
… | |
… | |
427 | * Free everything. That way malloc debugging can find leakage. |
409 | * Free everything. That way malloc debugging can find leakage. |
428 | */ |
410 | */ |
429 | void |
411 | void |
430 | rxvt_term::scr_release () NOTHROW |
412 | rxvt_term::scr_release () NOTHROW |
431 | { |
413 | { |
|
|
414 | if (row_buf) |
|
|
415 | { |
432 | delete talloc; talloc = 0; |
416 | delete talloc; talloc = 0; |
433 | delete ralloc; ralloc = 0; |
417 | delete ralloc; ralloc = 0; |
434 | |
418 | |
435 | free (row_buf); |
419 | free (row_buf); |
436 | free (swap_buf); |
420 | free (swap_buf); |
437 | free (drawn_buf); |
421 | free (drawn_buf); |
438 | free (tabs); |
422 | free (tabs); |
439 | |
423 | |
440 | row_buf = 0; // signal that we freed all the arrays |
424 | row_buf = 0; // signal that we freed all the arrays |
|
|
425 | } |
441 | } |
426 | } |
442 | |
427 | |
443 | /* ------------------------------------------------------------------------- */ |
428 | /* ------------------------------------------------------------------------- */ |
444 | /* |
429 | /* |
445 | * Hard reset |
430 | * Hard reset |
446 | */ |
431 | */ |
447 | void |
432 | void |
448 | rxvt_term::scr_poweron () NOTHROW |
433 | rxvt_term::scr_poweron () |
449 | { |
434 | { |
450 | scr_release (); |
435 | scr_release (); |
451 | prev_nrow = prev_ncol = 0; |
436 | prev_nrow = prev_ncol = 0; |
452 | scr_reset (); |
437 | scr_reset (); |
453 | |
438 | |
… | |
… | |
504 | assert (s->cur.row >= 0); |
489 | assert (s->cur.row >= 0); |
505 | assert (s->cur.col >= 0); |
490 | assert (s->cur.col >= 0); |
506 | #endif |
491 | #endif |
507 | } |
492 | } |
508 | |
493 | |
|
|
494 | void |
|
|
495 | rxvt_term::scr_swap_screen () |
|
|
496 | { |
|
|
497 | if (!option (Opt_secondaryScreen)) |
|
|
498 | return; |
|
|
499 | |
|
|
500 | for (int i = prev_nrow; i--; ) |
|
|
501 | ::swap (ROW(i), swap_buf [i]); |
|
|
502 | |
|
|
503 | ::swap (screen.cur, swap.cur); |
|
|
504 | |
|
|
505 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
|
|
506 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
|
|
507 | } |
|
|
508 | |
509 | /* ------------------------------------------------------------------------- */ |
509 | /* ------------------------------------------------------------------------- */ |
510 | /* |
510 | /* |
511 | * Swap between primary and secondary screens |
511 | * Swap between primary and secondary screens |
512 | * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h |
512 | * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h |
513 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
513 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
514 | */ |
514 | */ |
515 | int |
515 | void |
516 | rxvt_term::scr_change_screen (int scrn) NOTHROW |
516 | rxvt_term::scr_change_screen (int scrn) |
517 | { |
517 | { |
|
|
518 | if (scrn == current_screen) |
|
|
519 | return; |
|
|
520 | |
518 | want_refresh = 1; |
521 | want_refresh = 1; |
519 | view_start = 0; |
522 | view_start = 0; |
520 | |
523 | |
521 | if (current_screen == scrn) |
|
|
522 | return scrn; |
|
|
523 | |
|
|
524 | selection_check (2); /* check for boundary cross */ |
524 | selection_check (2); /* check for boundary cross */ |
525 | |
525 | |
526 | int i = current_screen; current_screen = scrn; scrn = i; |
526 | int i = current_screen; current_screen = scrn; scrn = i; |
527 | |
527 | |
528 | ::swap (screen.cur.row, swap.cur.row); |
|
|
529 | ::swap (screen.cur.col, swap.cur.col); |
|
|
530 | |
|
|
531 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
|
|
532 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
|
|
533 | |
|
|
534 | #if NSCREENS |
528 | #if NSCREENS |
535 | if (OPTION (Opt_secondaryScreen)) |
529 | if (option (Opt_secondaryScreen)) |
536 | { |
530 | { |
537 | num_scr = 0; |
531 | num_scr = 0; |
538 | |
532 | |
539 | for (int i = prev_nrow; i--; ) |
533 | scr_swap_screen (); |
540 | ::swap (ROW(i), swap_buf [i]); |
|
|
541 | |
534 | |
542 | ::swap (screen.charset, swap.charset); |
535 | ::swap (screen.charset, swap.charset); |
543 | ::swap (screen.flags, swap.flags); |
536 | ::swap (screen.flags, swap.flags); |
544 | screen.flags |= Screen_VisibleCursor; |
537 | screen.flags |= Screen_VisibleCursor; |
545 | swap.flags |= Screen_VisibleCursor; |
538 | swap.flags |= Screen_VisibleCursor; |
546 | } |
539 | } |
547 | else |
540 | else |
548 | #endif |
541 | #endif |
549 | if (OPTION (Opt_secondaryScroll)) |
542 | if (option (Opt_secondaryScroll)) |
550 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
543 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
551 | |
|
|
552 | return scrn; |
|
|
553 | } |
544 | } |
554 | |
545 | |
555 | // clear WrapNext indicator, solidifying position on next line |
546 | // clear WrapNext indicator, solidifying position on next line |
556 | void |
547 | void |
557 | rxvt_term::scr_do_wrap () NOTHROW |
548 | rxvt_term::scr_do_wrap () NOTHROW |
… | |
… | |
589 | /* |
580 | /* |
590 | * Change the rendition style for following text |
581 | * Change the rendition style for following text |
591 | */ |
582 | */ |
592 | void |
583 | void |
593 | rxvt_term::scr_rendition (int set, int style) NOTHROW |
584 | rxvt_term::scr_rendition (int set, int style) NOTHROW |
594 | { |
585 | { |
595 | if (set) |
586 | if (set) |
596 | rstyle |= style; |
587 | rstyle |= style; |
597 | else if (style == ~RS_None) |
588 | else if (style == ~RS_None) |
598 | rstyle = DEFAULT_RSTYLE; |
589 | rstyle = DEFAULT_RSTYLE; |
599 | else |
590 | else |
600 | rstyle &= ~style; |
591 | rstyle &= ~style; |
601 | } |
592 | } |
602 | |
593 | |
603 | /* ------------------------------------------------------------------------- */ |
594 | /* ------------------------------------------------------------------------- */ |
604 | /* |
595 | /* |
605 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
596 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
606 | * count positive ==> scroll up |
597 | * count positive ==> scroll up |
… | |
… | |
615 | want_refresh = 1; |
606 | want_refresh = 1; |
616 | num_scr += count; |
607 | num_scr += count; |
617 | |
608 | |
618 | if (count > 0 |
609 | if (count > 0 |
619 | && row1 == 0 |
610 | && row1 == 0 |
620 | && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) |
611 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
621 | { |
612 | { |
622 | top_row = max (top_row - count, -saveLines); |
613 | top_row = max (top_row - count, -saveLines); |
623 | |
614 | |
624 | // scroll everything up 'count' lines |
615 | // scroll everything up 'count' lines |
625 | term_start = (term_start + count) % total_rows; |
616 | term_start = (term_start + count) % total_rows; |
… | |
… | |
632 | } |
623 | } |
633 | |
624 | |
634 | // erase newly scrolled-in lines |
625 | // erase newly scrolled-in lines |
635 | for (int i = count; i--; ) |
626 | for (int i = count; i--; ) |
636 | { |
627 | { |
637 | // basically this is a slightly optimized scr_blank_screen_mem |
|
|
638 | // it is worth the effort on slower machines |
|
|
639 | line_t &l = ROW(nrow - 1 - i); |
628 | line_t &l = ROW(nrow - 1 - i); |
640 | |
629 | |
|
|
630 | // optimize if already cleared, can be significant on slow machines |
|
|
631 | // could be rolled into scr_blank_screen_mem |
|
|
632 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
|
|
633 | { |
641 | scr_blank_line (l, 0, l.l, rstyle); |
634 | scr_blank_line (l, 0, l.l, rstyle); |
642 | |
|
|
643 | l.l = 0; |
635 | l.l = 0; |
644 | l.f = 0; |
636 | l.f = 0; |
|
|
637 | } |
|
|
638 | else |
|
|
639 | scr_blank_screen_mem (l, rstyle); |
645 | } |
640 | } |
646 | |
641 | |
647 | // now copy lines below the scroll region bottom to the |
642 | // now copy lines below the scroll region bottom to the |
648 | // bottom of the screen again, so they look as if they |
643 | // bottom of the screen again, so they look as if they |
649 | // hadn't moved. |
644 | // hadn't moved. |
… | |
… | |
653 | line_t &l2 = ROW(i); |
648 | line_t &l2 = ROW(i); |
654 | |
649 | |
655 | ::swap (l1, l2); |
650 | ::swap (l1, l2); |
656 | l2.touch (); |
651 | l2.touch (); |
657 | } |
652 | } |
658 | |
653 | |
659 | // move and/or clear selection, if any |
654 | // move and/or clear selection, if any |
660 | if (selection.op && current_screen == selection.screen) |
655 | if (selection.op && current_screen == selection.screen) |
661 | { |
656 | { |
662 | selection.beg.row -= count; |
657 | selection.beg.row -= count; |
663 | selection.end.row -= count; |
658 | selection.end.row -= count; |
… | |
… | |
671 | selection.op = SELECTION_CLEAR; |
666 | selection.op = SELECTION_CLEAR; |
672 | } |
667 | } |
673 | } |
668 | } |
674 | |
669 | |
675 | // finally move the view window, if desired |
670 | // finally move the view window, if desired |
676 | if (OPTION (Opt_scrollWithBuffer) |
671 | if (option (Opt_scrollWithBuffer) |
677 | && view_start != 0 |
672 | && view_start != 0 |
678 | && view_start != -saveLines) |
673 | && view_start != -saveLines) |
679 | scr_page (UP, count); |
674 | scr_page (UP, count); |
680 | |
675 | |
681 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
676 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
… | |
… | |
699 | { |
694 | { |
700 | /* move selected region too */ |
695 | /* move selected region too */ |
701 | selection.beg.row -= count; |
696 | selection.beg.row -= count; |
702 | selection.end.row -= count; |
697 | selection.end.row -= count; |
703 | selection.mark.row -= count; |
698 | selection.mark.row -= count; |
704 | |
699 | |
705 | selection_check (0); |
700 | selection_check (0); |
706 | } |
701 | } |
707 | } |
702 | } |
708 | |
703 | |
709 | // use a simple and robust scrolling algorithm, this |
704 | // use a simple and robust scrolling algorithm, this |
… | |
… | |
749 | ZERO_SCROLLBACK (); |
744 | ZERO_SCROLLBACK (); |
750 | |
745 | |
751 | if (minlines > 0) |
746 | if (minlines > 0) |
752 | { |
747 | { |
753 | minlines += screen.cur.row - screen.bscroll; |
748 | minlines += screen.cur.row - screen.bscroll; |
|
|
749 | min_it (minlines, screen.cur.row - top_row); |
754 | |
750 | |
755 | if (minlines > 0 |
751 | if (minlines > 0 |
756 | && screen.tscroll == 0 |
752 | && screen.tscroll == 0 |
757 | && screen.bscroll == nrow - 1) |
753 | && screen.bscroll == nrow - 1) |
758 | { |
754 | { |
… | |
… | |
775 | |
771 | |
776 | while (str < strend) |
772 | while (str < strend) |
777 | { |
773 | { |
778 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
774 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
779 | |
775 | |
780 | if (c < 0x20) |
776 | if (expect_false (c < 0x20)) |
781 | if (c == C0_LF) |
777 | if (c == C0_LF) |
782 | { |
778 | { |
783 | max_it (line->l, screen.cur.col); |
779 | max_it (line->l, screen.cur.col); |
784 | |
780 | |
785 | screen.flags &= ~Screen_WrapNext; |
781 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
804 | { |
800 | { |
805 | scr_tab (1, true); |
801 | scr_tab (1, true); |
806 | continue; |
802 | continue; |
807 | } |
803 | } |
808 | |
804 | |
|
|
805 | if (expect_false ( |
809 | if (checksel /* see if we're writing within selection */ |
806 | checksel /* see if we're writing within selection */ |
810 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
807 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
811 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
808 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
|
|
809 | )) |
812 | { |
810 | { |
813 | checksel = 0; |
811 | checksel = 0; |
814 | /* |
812 | /* |
815 | * If we wrote anywhere in the selected area, kill the selection |
813 | * If we wrote anywhere in the selected area, kill the selection |
816 | * XXX: should we kill the mark too? Possibly, but maybe that |
814 | * XXX: should we kill the mark too? Possibly, but maybe that |
817 | * should be a similar check. |
815 | * should be a similar check. |
818 | */ |
816 | */ |
819 | CLEAR_SELECTION (); |
817 | CLEAR_SELECTION (); |
820 | } |
818 | } |
821 | |
819 | |
822 | if (screen.flags & Screen_WrapNext) |
820 | if (expect_false (screen.flags & Screen_WrapNext)) |
823 | { |
821 | { |
824 | scr_do_wrap (); |
822 | scr_do_wrap (); |
825 | |
823 | |
826 | line->l = ncol; |
824 | line->l = ncol; |
827 | line->is_longer (1); |
825 | line->is_longer (1); |
828 | |
826 | |
829 | row = screen.cur.row; |
827 | row = screen.cur.row; |
830 | line = &ROW(row); /* _must_ refresh */ |
828 | line = &ROW(row); /* _must_ refresh */ |
831 | } |
829 | } |
832 | |
830 | |
833 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
831 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
834 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
832 | if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
835 | c = 0xfffd; |
833 | c = 0xfffd; |
836 | |
834 | |
837 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
835 | // rely on wcwidth to tell us the character width, do wcwidth before |
838 | // do wcwidth before further replacements, as wcwidth might return -1 |
836 | // further replacements, as wcwidth might return -1 for the line |
839 | // for the line drawing characters below as they might be invalid in the current |
837 | // drawing characters below as they might be invalid in the current |
840 | // locale. |
838 | // locale. |
841 | int width = c < 0x100 ? 1 : wcwidth (c); |
839 | int width = WCWIDTH (c); |
842 | |
840 | |
843 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
841 | if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL |
844 | { |
842 | { |
845 | // vt100 special graphics and line drawing |
843 | // vt100 special graphics and line drawing |
846 | // 5f-7e standard vt100 |
844 | // 5f-7e standard vt100 |
847 | // 40-5e rxvt extension for extra curses acs chars |
845 | // 40-5e rxvt extension for extra curses acs chars |
848 | static uint16_t vt100_0[62] = { // 41 .. 7e |
846 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
861 | c = vt100_0[c - 0x41]; |
859 | c = vt100_0[c - 0x41]; |
862 | width = 1; // vt100 line drawing characters are always single-width |
860 | width = 1; // vt100 line drawing characters are always single-width |
863 | } |
861 | } |
864 | } |
862 | } |
865 | |
863 | |
866 | if (screen.flags & Screen_Insert) |
864 | if (expect_false (screen.flags & Screen_Insert)) |
867 | scr_insdel_chars (width, INSERT); |
865 | scr_insdel_chars (width, INSERT); |
868 | |
866 | |
869 | if (width != 0) |
867 | if (width != 0) |
870 | { |
868 | { |
871 | #if !UNICODE_3 |
869 | #if !UNICODE_3 |
… | |
… | |
877 | c = 0xfffd; |
875 | c = 0xfffd; |
878 | # endif |
876 | # endif |
879 | #endif |
877 | #endif |
880 | |
878 | |
881 | // nuke the character at this position, if required |
879 | // nuke the character at this position, if required |
|
|
880 | if (expect_false ( |
882 | if (line->t[screen.cur.col] == NOCHAR |
881 | line->t[screen.cur.col] == NOCHAR |
883 | || (screen.cur.col < ncol - 1 |
882 | || (screen.cur.col < ncol - 1 |
884 | && line->t[screen.cur.col + 1] == NOCHAR)) |
883 | && line->t[screen.cur.col + 1] == NOCHAR) |
|
|
884 | )) |
885 | { |
885 | { |
886 | int col = screen.cur.col; |
886 | int col = screen.cur.col; |
887 | |
887 | |
888 | // find begin |
888 | // find begin |
889 | while (col > 0 && line->t[col] == NOCHAR) |
889 | while (col > 0 && line->t[col] == NOCHAR) |
… | |
… | |
900 | } |
900 | } |
901 | |
901 | |
902 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
902 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
903 | |
903 | |
904 | // if the character doesn't fit into the remaining columns... |
904 | // if the character doesn't fit into the remaining columns... |
905 | if (screen.cur.col > ncol - width && ncol >= width) |
905 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
906 | { |
906 | { |
907 | // ...output spaces |
907 | // ...output spaces |
908 | c = ' '; |
908 | c = ' '; |
909 | // and try the same character next loop iteration |
909 | // and try the same character next loop iteration |
910 | --str; |
910 | --str; |
… | |
… | |
915 | do |
915 | do |
916 | { |
916 | { |
917 | line->t[screen.cur.col] = c; |
917 | line->t[screen.cur.col] = c; |
918 | line->r[screen.cur.col] = rend; |
918 | line->r[screen.cur.col] = rend; |
919 | |
919 | |
920 | if (screen.cur.col < ncol - 1) |
920 | if (expect_true (screen.cur.col < ncol - 1)) |
921 | screen.cur.col++; |
921 | screen.cur.col++; |
922 | else |
922 | else |
923 | { |
923 | { |
924 | line->l = ncol; |
924 | line->l = ncol; |
925 | if (screen.flags & Screen_Autowrap) |
925 | if (screen.flags & Screen_Autowrap) |
… | |
… | |
927 | break; |
927 | break; |
928 | } |
928 | } |
929 | |
929 | |
930 | c = NOCHAR; |
930 | c = NOCHAR; |
931 | } |
931 | } |
932 | while (--width > 0); |
932 | while (expect_false (--width > 0)); |
933 | |
933 | |
934 | // pad with spaces when overwriting wide character with smaller one |
934 | // pad with spaces when overwriting wide character with smaller one |
935 | if (!width) |
935 | if (expect_false (!width)) |
936 | { |
936 | { |
937 | line->touch (); |
937 | line->touch (); |
938 | |
938 | |
939 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
939 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
940 | { |
940 | { |
941 | line->t[c] = ' '; |
941 | line->t[c] = ' '; |
942 | line->r[c] = rend; |
942 | line->r[c] = rend; |
943 | } |
943 | } |
944 | } |
944 | } |
945 | } |
945 | } |
|
|
946 | #if ENABLE_COMBINING |
946 | else // width == 0 |
947 | else // width == 0 |
947 | { |
948 | { |
948 | #if ENABLE_COMBINING |
949 | if (c != 0xfeff) // ignore BOM |
949 | // handle combining characters |
|
|
950 | // we just tag the accent on the previous on-screen character. |
|
|
951 | // this is arguably not correct, but also arguably not wrong. |
|
|
952 | // we don't handle double-width characters nicely yet. |
|
|
953 | line_t *linep; |
|
|
954 | text_t *tp; |
|
|
955 | rend_t *rp; |
|
|
956 | |
|
|
957 | if (screen.cur.col > 0) |
|
|
958 | { |
950 | { |
|
|
951 | // handle combining characters |
|
|
952 | // we just tag the accent on the previous on-screen character. |
|
|
953 | // this is arguably not correct, but also arguably not wrong. |
|
|
954 | // we don't handle double-width characters nicely yet. |
|
|
955 | line_t *linep; |
|
|
956 | text_t *tp; |
|
|
957 | rend_t *rp; |
|
|
958 | |
|
|
959 | if (screen.cur.col > 0) |
|
|
960 | { |
959 | linep = line; |
961 | linep = line; |
960 | tp = line->t + screen.cur.col - 1; |
962 | tp = line->t + screen.cur.col - 1; |
961 | rp = line->r + screen.cur.col - 1; |
963 | rp = line->r + screen.cur.col - 1; |
|
|
964 | } |
|
|
965 | else if (screen.cur.row > 0 |
|
|
966 | && ROW(screen.cur.row - 1).is_longer ()) |
|
|
967 | { |
|
|
968 | linep = &ROW(screen.cur.row - 1); |
|
|
969 | tp = line->t + ncol - 1; |
|
|
970 | rp = line->r + ncol - 1; |
|
|
971 | } |
|
|
972 | else |
|
|
973 | continue; |
|
|
974 | |
|
|
975 | linep->touch (); |
|
|
976 | |
|
|
977 | while (*tp == NOCHAR && tp > linep->t) |
|
|
978 | tp--, rp--; |
|
|
979 | |
|
|
980 | // first try to find a precomposed character |
|
|
981 | unicode_t n = rxvt_compose (*tp, c); |
|
|
982 | if (n == NOCHAR) |
|
|
983 | n = rxvt_composite.compose (*tp, c); |
|
|
984 | |
|
|
985 | *tp = n; |
|
|
986 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
962 | } |
987 | } |
963 | else if (screen.cur.row > 0 |
|
|
964 | && ROW(screen.cur.row - 1).is_longer ()) |
|
|
965 | { |
|
|
966 | linep = &ROW(screen.cur.row - 1); |
|
|
967 | tp = line->t + ncol - 1; |
|
|
968 | rp = line->r + ncol - 1; |
|
|
969 | } |
988 | } |
970 | else |
|
|
971 | continue; |
|
|
972 | |
|
|
973 | linep->touch (); |
|
|
974 | |
|
|
975 | while (*tp == NOCHAR && tp > linep->t) |
|
|
976 | tp--, rp--; |
|
|
977 | |
|
|
978 | // first try to find a precomposed character |
|
|
979 | unicode_t n = rxvt_compose (*tp, c); |
|
|
980 | if (n == NOCHAR) |
|
|
981 | n = rxvt_composite.compose (*tp, c); |
|
|
982 | |
|
|
983 | *tp = n; |
|
|
984 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
|
|
985 | #endif |
989 | #endif |
986 | } |
|
|
987 | } |
990 | } |
988 | |
991 | |
989 | max_it (line->l, screen.cur.col); |
992 | max_it (line->l, screen.cur.col); |
990 | |
993 | |
991 | #ifdef DEBUG_STRICT |
994 | #ifdef DEBUG_STRICT |
… | |
… | |
999 | * XTERM_SEQ: CTRL-H |
1002 | * XTERM_SEQ: CTRL-H |
1000 | */ |
1003 | */ |
1001 | void |
1004 | void |
1002 | rxvt_term::scr_backspace () NOTHROW |
1005 | rxvt_term::scr_backspace () NOTHROW |
1003 | { |
1006 | { |
1004 | want_refresh = 1; |
|
|
1005 | |
|
|
1006 | if (screen.cur.col == 0) |
1007 | if (screen.cur.col == 0) |
1007 | { |
1008 | { |
1008 | if (screen.cur.row > 0) |
1009 | if (screen.cur.row > 0) |
1009 | { |
1010 | { |
1010 | #ifdef TERMCAP_HAS_BW |
1011 | #ifdef TERMCAP_HAS_BW |
1011 | screen.cur.col = ncol - 1; |
1012 | screen.cur.col = ncol - 1; |
1012 | screen.cur.row--; |
1013 | --screen.cur.row; |
1013 | return; |
1014 | |
|
|
1015 | want_refresh = 1; |
1014 | #endif |
1016 | #endif |
1015 | } |
1017 | } |
1016 | } |
1018 | } |
1017 | else if (!(screen.flags & Screen_WrapNext)) |
1019 | else |
1018 | scr_gotorc (0, -1, RELATIVE); |
1020 | scr_gotorc (0, -1, RELATIVE); |
1019 | |
|
|
1020 | screen.flags &= ~Screen_WrapNext; |
|
|
1021 | } |
1021 | } |
1022 | |
1022 | |
1023 | /* ------------------------------------------------------------------------- */ |
1023 | /* ------------------------------------------------------------------------- */ |
1024 | /* |
1024 | /* |
1025 | * Process Horizontal Tab |
1025 | * Process Horizontal Tab |
… | |
… | |
1048 | x = i; |
1048 | x = i; |
1049 | |
1049 | |
1050 | if (!--count) |
1050 | if (!--count) |
1051 | break; |
1051 | break; |
1052 | } |
1052 | } |
1053 | else |
1053 | else |
1054 | ht &= l.t[i] == ' ' |
1054 | ht &= l.t[i] == ' ' |
1055 | && RS_SAME (l.r[i], base_rend); |
1055 | && RS_SAME (l.r[i], base_rend); |
1056 | |
1056 | |
1057 | if (count) |
1057 | if (count) |
1058 | x = ncol - 1; |
1058 | x = ncol - 1; |
1059 | |
1059 | |
1060 | // store horizontal tab commands as characters inside the text |
1060 | // store horizontal tab commands as characters inside the text |
1061 | // buffer so they can be selected and pasted. |
1061 | // buffer so they can be selected and pasted. |
1062 | if (ht && OPTION (Opt_pastableTabs)) |
1062 | if (ht && option (Opt_pastableTabs)) |
1063 | { |
1063 | { |
1064 | base_rend = SET_FONT (base_rend, 0); |
1064 | base_rend = SET_FONT (base_rend, 0); |
1065 | |
1065 | |
1066 | l.touch (x); |
1066 | l.touch (x); |
1067 | |
1067 | |
… | |
… | |
1100 | * Process DEC Back Index |
1100 | * Process DEC Back Index |
1101 | * XTERM_SEQ: ESC 6 |
1101 | * XTERM_SEQ: ESC 6 |
1102 | * Move cursor left in row. If we're at the left boundary, shift everything |
1102 | * Move cursor left in row. If we're at the left boundary, shift everything |
1103 | * in that row right. Clear left column. |
1103 | * in that row right. Clear left column. |
1104 | */ |
1104 | */ |
1105 | #if ENABLE_FRILLS |
1105 | #if !ENABLE_MINIMAL |
1106 | void |
1106 | void |
1107 | rxvt_term::scr_backindex () NOTHROW |
1107 | rxvt_term::scr_backindex () NOTHROW |
1108 | { |
1108 | { |
1109 | if (screen.cur.col > 0) |
1109 | if (screen.cur.col > 0) |
1110 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1110 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
… | |
… | |
1117 | * Process DEC Forward Index |
1117 | * Process DEC Forward Index |
1118 | * XTERM_SEQ: ESC 9 |
1118 | * XTERM_SEQ: ESC 9 |
1119 | * Move cursor right in row. If we're at the right boundary, shift everything |
1119 | * Move cursor right in row. If we're at the right boundary, shift everything |
1120 | * in that row left. Clear right column. |
1120 | * in that row left. Clear right column. |
1121 | */ |
1121 | */ |
1122 | #if ENABLE_FRILLS |
1122 | #if !ENABLE_MINIMAL |
1123 | void |
1123 | void |
1124 | rxvt_term::scr_forwardindex () NOTHROW |
1124 | rxvt_term::scr_forwardindex () NOTHROW |
1125 | { |
1125 | { |
1126 | if (screen.cur.col < ncol - 1) |
1126 | if (screen.cur.col < ncol - 1) |
1127 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1127 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
… | |
… | |
1174 | } |
1174 | } |
1175 | } |
1175 | } |
1176 | else |
1176 | else |
1177 | { |
1177 | { |
1178 | if (screen.flags & Screen_Relative) |
1178 | if (screen.flags & Screen_Relative) |
|
|
1179 | { |
1179 | { /* relative origin mode */ |
1180 | /* relative origin mode */ |
1180 | screen.cur.row = row + screen.tscroll; |
1181 | screen.cur.row = row + screen.tscroll; |
1181 | min_it (screen.cur.row, screen.bscroll); |
1182 | min_it (screen.cur.row, screen.bscroll); |
1182 | } |
1183 | } |
1183 | else |
1184 | else |
1184 | screen.cur.row = row; |
1185 | screen.cur.row = row; |
… | |
… | |
1217 | /* |
1218 | /* |
1218 | * Erase part or whole of a line |
1219 | * Erase part or whole of a line |
1219 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1220 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1220 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1221 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1221 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1222 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
|
|
1223 | * extension: clear to right unless wrapped: ESC [ 3 K |
1222 | */ |
1224 | */ |
1223 | void |
1225 | void |
1224 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1226 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1225 | { |
1227 | { |
1226 | unsigned int col, num; |
1228 | unsigned int col, num; |
… | |
… | |
1235 | line.touch (); |
1237 | line.touch (); |
1236 | line.is_longer (0); |
1238 | line.is_longer (0); |
1237 | |
1239 | |
1238 | switch (mode) |
1240 | switch (mode) |
1239 | { |
1241 | { |
|
|
1242 | case 3: |
|
|
1243 | if (screen.flags & Screen_WrapNext) |
|
|
1244 | return; |
|
|
1245 | |
|
|
1246 | /* fall through */ |
|
|
1247 | |
1240 | case 0: /* erase to end of line */ |
1248 | case 0: /* erase to end of line */ |
1241 | col = screen.cur.col; |
1249 | col = screen.cur.col; |
1242 | num = ncol - col; |
1250 | num = ncol - col; |
1243 | min_it (line.l, col); |
1251 | min_it (line.l, col); |
|
|
1252 | |
1244 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1253 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1245 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1254 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1246 | CLEAR_SELECTION (); |
1255 | CLEAR_SELECTION (); |
1247 | break; |
1256 | break; |
|
|
1257 | |
1248 | case 1: /* erase to beginning of line */ |
1258 | case 1: /* erase to beginning of line */ |
1249 | col = 0; |
1259 | col = 0; |
1250 | num = screen.cur.col + 1; |
1260 | num = screen.cur.col + 1; |
|
|
1261 | |
1251 | if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) |
1262 | if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) |
1252 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1263 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1253 | CLEAR_SELECTION (); |
1264 | CLEAR_SELECTION (); |
1254 | break; |
1265 | break; |
|
|
1266 | |
1255 | case 2: /* erase whole line */ |
1267 | case 2: /* erase whole line */ |
1256 | col = 0; |
1268 | col = 0; |
1257 | num = ncol; |
1269 | num = ncol; |
1258 | line.l = 0; |
1270 | line.l = 0; |
1259 | if (selection.beg.row <= screen.cur.row |
1271 | if (selection.beg.row <= screen.cur.row |
… | |
… | |
1317 | if (row >= nrow) /* Out Of Bounds */ |
1329 | if (row >= nrow) /* Out Of Bounds */ |
1318 | return; |
1330 | return; |
1319 | |
1331 | |
1320 | min_it (num, nrow - row); |
1332 | min_it (num, nrow - row); |
1321 | |
1333 | |
|
|
1334 | /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */ |
1322 | if (rstyle & (RS_RVid | RS_Uline)) |
1335 | if (rstyle & (RS_RVid | RS_Uline)) |
1323 | ren = (rend_t) ~RS_None; |
1336 | ren = (rend_t) ~RS_None; |
1324 | else if (GET_BASEBG (rstyle) == Color_bg) |
1337 | else if (GET_BASEBG (rstyle) == Color_bg) |
1325 | { |
1338 | { |
1326 | ren = DEFAULT_RSTYLE; |
1339 | ren = DEFAULT_RSTYLE; |
1327 | CLEAR_ROWS (row, num); |
1340 | |
|
|
1341 | if (mapped) |
|
|
1342 | XClearArea (dpy, vt, 0, |
|
|
1343 | Row2Pixel (row), (unsigned int)width, |
|
|
1344 | (unsigned int)Height2Pixel (num), False); |
1328 | } |
1345 | } |
1329 | else |
1346 | else |
1330 | { |
1347 | { |
1331 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1348 | ren = rstyle & (RS_fgMask | RS_bgMask); |
|
|
1349 | |
1332 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1350 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1333 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1351 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1334 | ERASE_ROWS (row, num); |
1352 | XFillRectangle (dpy, vt, gc, |
|
|
1353 | 0, Row2Pixel (row), |
|
|
1354 | (unsigned int)width, |
|
|
1355 | (unsigned int)Height2Pixel (num)); |
1335 | gcvalue.foreground = pix_colors[Color_fg]; |
1356 | gcvalue.foreground = pix_colors[Color_fg]; |
1336 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1357 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1337 | } |
1358 | } |
1338 | |
1359 | |
1339 | for (; num--; row++) |
1360 | for (; num--; row++) |
1340 | { |
1361 | { |
1341 | scr_blank_screen_mem (ROW(row), rstyle); |
1362 | scr_blank_screen_mem (ROW(row), rstyle); |
1342 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1363 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1343 | } |
1364 | } |
1344 | } |
1365 | } |
1345 | |
1366 | |
1346 | #if ENABLE_FRILLS |
1367 | #if !ENABLE_MINIMAL |
1347 | void |
1368 | void |
1348 | rxvt_term::scr_erase_savelines () NOTHROW |
1369 | rxvt_term::scr_erase_savelines () NOTHROW |
1349 | { |
1370 | { |
1350 | want_refresh = 1; |
1371 | want_refresh = 1; |
1351 | ZERO_SCROLLBACK (); |
1372 | ZERO_SCROLLBACK (); |
… | |
… | |
1460 | { |
1481 | { |
1461 | if (selection.end.row != screen.cur.row |
1482 | if (selection.end.row != screen.cur.row |
1462 | || (selection.end.col + count >= ncol)) |
1483 | || (selection.end.col + count >= ncol)) |
1463 | CLEAR_SELECTION (); |
1484 | CLEAR_SELECTION (); |
1464 | else |
1485 | else |
|
|
1486 | { |
1465 | { /* shift selection */ |
1487 | /* shift selection */ |
1466 | selection.beg.col += count; |
1488 | selection.beg.col += count; |
1467 | selection.mark.col += count; /* XXX: yes? */ |
1489 | selection.mark.col += count; /* XXX: yes? */ |
1468 | selection.end.col += count; |
1490 | selection.end.col += count; |
1469 | } |
1491 | } |
1470 | } |
1492 | } |
… | |
… | |
1475 | case ERASE: |
1497 | case ERASE: |
1476 | screen.cur.col += count; /* don't worry if > ncol */ |
1498 | screen.cur.col += count; /* don't worry if > ncol */ |
1477 | selection_check (1); |
1499 | selection_check (1); |
1478 | screen.cur.col -= count; |
1500 | screen.cur.col -= count; |
1479 | |
1501 | |
1480 | line->l = max (line->l - count, 0); |
|
|
1481 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1502 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1482 | break; |
1503 | break; |
1483 | |
1504 | |
1484 | case DELETE: |
1505 | case DELETE: |
1485 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1506 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
… | |
… | |
1609 | */ |
1630 | */ |
1610 | void |
1631 | void |
1611 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1632 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1612 | { |
1633 | { |
1613 | if (mode < 0) |
1634 | if (mode < 0) |
1614 | memset (tabs, 0, ncol * sizeof (char)); |
1635 | memset (tabs, 0, ncol); |
1615 | else if (screen.cur.col < ncol) |
1636 | else if (screen.cur.col < ncol) |
1616 | tabs [screen.cur.col] = !!mode; |
1637 | tabs [screen.cur.col] = !!mode; |
1617 | } |
1638 | } |
1618 | |
1639 | |
1619 | /* ------------------------------------------------------------------------- */ |
1640 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1634 | if (rvideo_state != on) |
1655 | if (rvideo_state != on) |
1635 | { |
1656 | { |
1636 | rvideo_state = on; |
1657 | rvideo_state = on; |
1637 | |
1658 | |
1638 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1659 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1639 | #if XPM_BACKGROUND |
1660 | #ifdef HAVE_BG_PIXMAP |
1640 | if (bgPixmap.pixmap == None) |
1661 | if (bgPixmap.pixmap == None) |
1641 | #endif |
1662 | #endif |
1642 | #if TRANSPARENT |
|
|
1643 | if (!OPTION (Opt_transparent) || am_transparent == 0) |
|
|
1644 | #endif |
|
|
1645 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
1663 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1646 | |
1664 | |
1647 | XGCValues gcvalue; |
1665 | XGCValues gcvalue; |
1648 | gcvalue.foreground = pix_colors[Color_fg]; |
1666 | gcvalue.foreground = pix_colors[Color_fg]; |
1649 | gcvalue.background = pix_colors[Color_bg]; |
1667 | gcvalue.background = pix_colors[Color_bg]; |
1650 | XChangeGC (display->display, gc, GCBackground | GCForeground, &gcvalue); |
1668 | XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue); |
1651 | |
1669 | |
1652 | scr_clear (); |
1670 | scr_clear (); |
1653 | scr_touch (true); |
1671 | scr_touch (true); |
1654 | } |
1672 | } |
1655 | } |
1673 | } |
… | |
… | |
1740 | { |
1758 | { |
1741 | bool found = false; |
1759 | bool found = false; |
1742 | |
1760 | |
1743 | for (int i = 0; i < nrow; i++) |
1761 | for (int i = 0; i < nrow; i++) |
1744 | { |
1762 | { |
1745 | int col = 0; |
|
|
1746 | rend_t *drp = drawn_buf[i].r; |
1763 | rend_t *drp = drawn_buf[i].r; |
1747 | |
1764 | |
1748 | for (; col < ncol; col++, drp++) |
1765 | for (int col = 0; col < ncol; col++, drp++) |
1749 | if ((*drp & mask) == value) |
1766 | if ((*drp & mask) == value) |
1750 | { |
1767 | { |
1751 | found = true; |
1768 | found = true; |
1752 | *drp = ~value; |
1769 | *drp = ~value; |
1753 | } |
1770 | } |
… | |
… | |
1793 | for (i = PART_BEG; i < RC_COUNT; i++) |
1810 | for (i = PART_BEG; i < RC_COUNT; i++) |
1794 | { |
1811 | { |
1795 | min_it (rc[i].col, ncol - 1); |
1812 | min_it (rc[i].col, ncol - 1); |
1796 | min_it (rc[i].row, nrow - 1); |
1813 | min_it (rc[i].row, nrow - 1); |
1797 | } |
1814 | } |
1798 | |
1815 | // TODO: this line somehow causes segfault if scr_expose() is called just after resize |
1799 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1816 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1800 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1817 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1801 | |
1818 | |
1802 | num_scr_allow = 0; |
1819 | num_scr_allow = 0; |
1803 | |
1820 | |
… | |
… | |
1858 | return true; |
1875 | return true; |
1859 | } |
1876 | } |
1860 | |
1877 | |
1861 | #ifndef NO_BELL |
1878 | #ifndef NO_BELL |
1862 | void |
1879 | void |
1863 | rxvt_term::bell_cb (time_watcher &w) |
1880 | rxvt_term::bell_cb (ev::timer &w, int revents) |
1864 | { |
1881 | { |
1865 | rvideo_bell = false; |
1882 | rvideo_bell = false; |
1866 | scr_rvideo_mode (rvideo_mode); |
1883 | scr_rvideo_mode (rvideo_mode); |
|
|
1884 | refresh_check (); |
1867 | } |
1885 | } |
1868 | #endif |
1886 | #endif |
1869 | |
1887 | |
1870 | /* ------------------------------------------------------------------------- */ |
1888 | /* ------------------------------------------------------------------------- */ |
1871 | void |
1889 | void |
… | |
… | |
1873 | { |
1891 | { |
1874 | #ifndef NO_BELL |
1892 | #ifndef NO_BELL |
1875 | |
1893 | |
1876 | # ifndef NO_MAPALERT |
1894 | # ifndef NO_MAPALERT |
1877 | # ifdef MAPALERT_OPTION |
1895 | # ifdef MAPALERT_OPTION |
1878 | if (OPTION (Opt_mapAlert)) |
1896 | if (option (Opt_mapAlert)) |
1879 | # endif |
1897 | # endif |
1880 | XMapWindow (display->display, parent[0]); |
1898 | XMapWindow (dpy, parent[0]); |
1881 | # endif |
1899 | # endif |
1882 | |
1900 | |
|
|
1901 | # if ENABLE_FRILLS |
|
|
1902 | if (option (Opt_urgentOnBell)) |
|
|
1903 | set_urgency (1); |
|
|
1904 | # endif |
|
|
1905 | |
1883 | if (OPTION (Opt_visualBell)) |
1906 | if (option (Opt_visualBell)) |
1884 | { |
1907 | { |
1885 | rvideo_bell = true; |
1908 | rvideo_bell = true; |
1886 | scr_rvideo_mode (rvideo_mode); |
1909 | scr_rvideo_mode (rvideo_mode); |
1887 | display->flush (); |
1910 | flush (); |
1888 | |
1911 | |
1889 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1912 | bell_ev.start (VISUAL_BELL_DURATION); |
1890 | } |
1913 | } |
1891 | else |
1914 | else |
1892 | XBell (display->display, 0); |
1915 | XBell (dpy, 0); |
1893 | |
|
|
1894 | #endif |
1916 | #endif |
1895 | } |
1917 | } |
1896 | |
1918 | |
1897 | /* ------------------------------------------------------------------------- */ |
1919 | /* ------------------------------------------------------------------------- */ |
1898 | /* ARGSUSED */ |
1920 | /* ARGSUSED */ |
1899 | void |
1921 | void |
1900 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1922 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1901 | { |
1923 | { |
1902 | #ifdef PRINTPIPE |
1924 | #ifdef PRINTPIPE |
1903 | int nrows, row_start; |
1925 | int nrows, row_start; |
1904 | FILE *fd; |
1926 | FILE *fd = popen_printer (); |
1905 | |
1927 | |
1906 | if ((fd = popen_printer ()) == NULL) |
1928 | if (!fd) |
1907 | return; |
1929 | return; |
1908 | |
1930 | |
1909 | if (fullhist) |
1931 | if (fullhist) |
1910 | { |
1932 | { |
1911 | nrows = nrow - top_row; |
1933 | nrows = nrow - top_row; |
… | |
… | |
1956 | * screen.text/screen.rend contain what the screen will change to. |
1978 | * screen.text/screen.rend contain what the screen will change to. |
1957 | */ |
1979 | */ |
1958 | void |
1980 | void |
1959 | rxvt_term::scr_refresh () NOTHROW |
1981 | rxvt_term::scr_refresh () NOTHROW |
1960 | { |
1982 | { |
1961 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1983 | unsigned char have_bg, |
1962 | showcursor; /* show the cursor */ |
1984 | showcursor; /* show the cursor */ |
1963 | int16_t col, row, /* column/row we're processing */ |
1985 | int16_t col, row, /* column/row we're processing */ |
1964 | ocrow; /* old cursor row */ |
1986 | ocrow; /* old cursor row */ |
1965 | int i; /* tmp */ |
1987 | int i; /* tmp */ |
1966 | #ifndef NO_CURSORCOLOR |
1988 | #ifndef NO_CURSORCOLOR |
1967 | rend_t cc1; /* store colours at cursor position (s) */ |
1989 | rend_t cc1; /* store colours at cursor position (s) */ |
1968 | #endif |
1990 | #endif |
1969 | rend_t *crp; // cursor rendition pointer |
1991 | rend_t *crp; // cursor rendition pointer |
|
|
1992 | rend_t ccol1, /* Cursor colour */ |
|
|
1993 | ccol2; /* Cursor colour2 */ |
1970 | |
1994 | |
1971 | want_refresh = 0; /* screen is current */ |
1995 | want_refresh = 0; /* screen is current */ |
1972 | |
1996 | |
1973 | if (refresh_type == NO_REFRESH || !mapped) |
1997 | if (refresh_type == NO_REFRESH || !mapped) |
1974 | return; |
1998 | return; |
1975 | |
1999 | |
1976 | /* |
2000 | /* |
1977 | * A: set up vars |
2001 | * A: set up vars |
1978 | */ |
2002 | */ |
1979 | must_clear = 0; |
|
|
1980 | refresh_count = 0; |
2003 | refresh_count = 0; |
1981 | |
2004 | |
1982 | #if XPM_BACKGROUND |
2005 | have_bg = 0; |
|
|
2006 | #ifdef HAVE_BG_PIXMAP |
1983 | must_clear |= bgPixmap.pixmap != None; |
2007 | have_bg = bgPixmap.pixmap != None; |
1984 | #endif |
|
|
1985 | #if TRANSPARENT |
|
|
1986 | must_clear |= OPTION (Opt_transparent) && am_transparent; |
|
|
1987 | #endif |
2008 | #endif |
1988 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2009 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1989 | |
2010 | |
1990 | /* |
2011 | /* |
1991 | * B: reverse any characters which are selected |
2012 | * B: reverse any characters which are selected |
… | |
… | |
1995 | /* |
2016 | /* |
1996 | * C: set the cursor character (s) |
2017 | * C: set the cursor character (s) |
1997 | */ |
2018 | */ |
1998 | { |
2019 | { |
1999 | unsigned char setoldcursor; |
2020 | unsigned char setoldcursor; |
2000 | rend_t ccol1, /* Cursor colour */ |
|
|
2001 | ccol2; /* Cursor colour2 */ |
|
|
2002 | |
2021 | |
2003 | showcursor = (screen.flags & Screen_VisibleCursor); |
2022 | showcursor = (screen.flags & Screen_VisibleCursor); |
2004 | #ifdef CURSOR_BLINK |
2023 | #ifdef CURSOR_BLINK |
2005 | if (hidden_cursor) |
2024 | if (hidden_cursor) |
2006 | showcursor = 0; |
2025 | showcursor = 0; |
… | |
… | |
2013 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2032 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2014 | col--; |
2033 | col--; |
2015 | |
2034 | |
2016 | crp = &ROW(screen.cur.row).r[col]; |
2035 | crp = &ROW(screen.cur.row).r[col]; |
2017 | |
2036 | |
|
|
2037 | #ifndef NO_CURSORCOLOR |
|
|
2038 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2039 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2040 | ccol1 = Color_cursor; |
|
|
2041 | else |
|
|
2042 | #endif |
|
|
2043 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2044 | ccol1 = fgcolor_of (rstyle); |
|
|
2045 | #else |
|
|
2046 | ccol1 = Color_fg; |
|
|
2047 | #endif |
|
|
2048 | |
|
|
2049 | #ifndef NO_CURSORCOLOR |
|
|
2050 | if (ISSET_PIXCOLOR (Color_cursor2)) |
|
|
2051 | ccol2 = Color_cursor2; |
|
|
2052 | else |
|
|
2053 | #endif |
|
|
2054 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2055 | ccol2 = bgcolor_of (rstyle); |
|
|
2056 | #else |
|
|
2057 | ccol2 = Color_bg; |
|
|
2058 | #endif |
|
|
2059 | |
2018 | if (showcursor && focus) |
2060 | if (showcursor && focus) |
2019 | { |
2061 | { |
2020 | if (OPTION (Opt_cursorUnderline)) |
2062 | if (option (Opt_cursorUnderline)) |
2021 | *crp ^= RS_Uline; |
2063 | *crp ^= RS_Uline; |
2022 | else |
2064 | else |
2023 | { |
2065 | { |
2024 | *crp ^= RS_RVid; |
2066 | *crp ^= RS_RVid; |
2025 | |
|
|
2026 | #ifndef NO_CURSORCOLOR |
|
|
2027 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2028 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2029 | ccol1 = Color_cursor; |
|
|
2030 | else |
|
|
2031 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2032 | ccol1 = fgcolor_of (rstyle); |
|
|
2033 | #else |
|
|
2034 | ccol1 = Color_fg; |
|
|
2035 | #endif |
|
|
2036 | if (ISSET_PIXCOLOR (Color_cursor2)) |
|
|
2037 | ccol2 = Color_cursor2; |
|
|
2038 | else |
|
|
2039 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2040 | ccol2 = bgcolor_of (rstyle); |
|
|
2041 | #else |
|
|
2042 | ccol2 = Color_bg; |
|
|
2043 | #endif |
|
|
2044 | *crp = SET_FGCOLOR (*crp, ccol1); |
2067 | *crp = SET_FGCOLOR (*crp, ccol1); |
2045 | *crp = SET_BGCOLOR (*crp, ccol2); |
2068 | *crp = SET_BGCOLOR (*crp, ccol2); |
2046 | #endif |
|
|
2047 | } |
2069 | } |
2048 | } |
2070 | } |
2049 | } |
2071 | } |
2050 | |
2072 | |
2051 | /* make sure no outline cursor is left around */ |
2073 | /* make sure no outline cursor is left around */ |
… | |
… | |
2090 | * D: CopyArea pass - very useful for slower links |
2112 | * D: CopyArea pass - very useful for slower links |
2091 | * This has been deliberately kept simple. |
2113 | * This has been deliberately kept simple. |
2092 | */ |
2114 | */ |
2093 | if (!display->is_local |
2115 | if (!display->is_local |
2094 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2116 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2095 | && abs (num_scr) < nrow && !must_clear) |
2117 | && abs (num_scr) < nrow && !have_bg) |
2096 | { |
2118 | { |
2097 | int16_t nits; |
2119 | int16_t nits; |
|
|
2120 | int i = num_scr; |
2098 | int j; |
2121 | int j; |
2099 | int len, wlen; |
2122 | int len, wlen; |
2100 | dLocal (int, num_scr); |
2123 | dLocal (int, num_scr); |
2101 | |
2124 | |
2102 | j = nrow; |
2125 | j = nrow; |
2103 | wlen = len = -1; |
2126 | wlen = len = -1; |
2104 | row = i > 0 ? 0 : j - 1; |
2127 | row = i > 0 ? 0 : j - 1; |
|
|
2128 | |
2105 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2129 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2106 | { |
2130 | { |
2107 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2131 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2108 | { |
2132 | { |
2109 | line_t s = ROW(view_start + row); |
2133 | line_t s = ROW(view_start + row); |
… | |
… | |
2130 | wlen = row; |
2154 | wlen = row; |
2131 | continue; |
2155 | continue; |
2132 | } |
2156 | } |
2133 | } |
2157 | } |
2134 | |
2158 | |
2135 | if (len != -1) |
2159 | if (len >= 0) |
2136 | { |
2160 | { |
2137 | /* also comes here at end if needed because of >= above */ |
2161 | /* also comes here at end if needed because of >= above */ |
2138 | if (wlen < len) |
2162 | if (wlen < len) |
2139 | ::swap (wlen, len); |
2163 | ::swap (wlen, len); |
2140 | |
2164 | |
|
|
2165 | XGCValues gcv; |
|
|
2166 | |
|
|
2167 | gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
2141 | XCopyArea (display->display, vt, vt, |
2168 | XCopyArea (dpy, vt, vt, |
2142 | gc, 0, Row2Pixel (len + i), |
2169 | gc, 0, Row2Pixel (len + i), |
2143 | (unsigned int)this->width, |
2170 | (unsigned int)this->width, |
2144 | (unsigned int)Height2Pixel (wlen - len + 1), |
2171 | (unsigned int)Height2Pixel (wlen - len + 1), |
2145 | 0, Row2Pixel (len)); |
2172 | 0, Row2Pixel (len)); |
|
|
2173 | gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
|
|
2174 | |
2146 | len = -1; |
2175 | len = -1; |
2147 | } |
2176 | } |
2148 | } |
2177 | } |
2149 | } |
2178 | } |
2150 | #endif |
2179 | #endif |
… | |
… | |
2174 | continue; |
2203 | continue; |
2175 | |
2204 | |
2176 | // redraw one or more characters |
2205 | // redraw one or more characters |
2177 | |
2206 | |
2178 | // seek to the beginning of wide characters |
2207 | // seek to the beginning of wide characters |
2179 | while (stp[col] == NOCHAR && col > 0) |
2208 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2180 | --col; |
2209 | --col; |
2181 | |
2210 | |
2182 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2211 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2183 | text_t *text = stp + col; |
2212 | text_t *text = stp + col; |
2184 | int count = 1; |
2213 | int count = 1; |
… | |
… | |
2206 | count++; |
2235 | count++; |
2207 | |
2236 | |
2208 | if (stp[col] != dtp[col] |
2237 | if (stp[col] != dtp[col] |
2209 | || !RS_SAME (srp[col], drp[col])) |
2238 | || !RS_SAME (srp[col], drp[col])) |
2210 | { |
2239 | { |
2211 | if (must_clear && (i++ > count / 2)) |
2240 | if (have_bg && (i++ > count / 2)) |
2212 | break; |
2241 | break; |
2213 | |
2242 | |
2214 | dtp[col] = stp[col]; |
2243 | dtp[col] = stp[col]; |
2215 | drp[col] = rend; |
2244 | drp[col] = rend; |
2216 | i = 0; |
2245 | i = 0; |
2217 | } |
2246 | } |
2218 | else if (must_clear || (stp[col] != ' ' && ++i >= 16)) |
2247 | else if (have_bg || (stp[col] != ' ' && ++i >= 16)) |
2219 | break; |
2248 | break; |
2220 | } |
2249 | } |
2221 | |
2250 | |
2222 | col--; /* went one too far. move back */ |
2251 | col--; /* went one too far. move back */ |
2223 | count -= i; /* dump any matching trailing chars */ |
2252 | count -= i; /* dump any matching trailing chars */ |
2224 | |
2253 | |
2225 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2254 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2226 | while (i && text[count] == NOCHAR) |
2255 | while (expect_false (i && text[count] == NOCHAR)) |
2227 | count++, i--; |
2256 | count++, i--; |
2228 | |
2257 | |
2229 | /* |
2258 | /* |
2230 | * Determine the attributes for the string |
2259 | * Determine the attributes for the string |
2231 | */ |
2260 | */ |
2232 | int fore = fgcolor_of (rend); // desired foreground |
2261 | int fore = fgcolor_of (rend); // desired foreground |
2233 | int back = bgcolor_of (rend); // desired background |
2262 | int back = bgcolor_of (rend); // desired background |
2234 | |
2263 | |
2235 | // only do special processing if any attributes are set, which is unlikely |
2264 | // only do special processing if any attributes are set, which is unlikely |
2236 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2265 | if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) |
2237 | { |
2266 | { |
2238 | #if ENABLE_STYLES |
|
|
2239 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2240 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
|
|
2241 | drp[col + 1] = ~srp[col + 1]; |
|
|
2242 | |
|
|
2243 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2244 | while (text > stp |
|
|
2245 | && srp[text - stp - 1] & RS_Careful |
|
|
2246 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2247 | text--, count++, xpixel -= fwidth; |
|
|
2248 | #endif |
|
|
2249 | |
|
|
2250 | bool invert = rend & RS_RVid; |
2267 | bool invert = rend & RS_RVid; |
2251 | |
2268 | |
2252 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2269 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2253 | if (rend & RS_Bold |
|
|
2254 | && fore == Color_fg) |
2270 | if (rend & RS_Bold && fore == Color_fg) |
2255 | { |
2271 | { |
2256 | if (ISSET_PIXCOLOR (Color_BD)) |
2272 | if (ISSET_PIXCOLOR (Color_BD)) |
2257 | fore = Color_BD; |
2273 | fore = Color_BD; |
2258 | # if !ENABLE_STYLES |
2274 | # if !ENABLE_STYLES |
2259 | else |
2275 | else |
2260 | invert = !invert; |
2276 | invert = !invert; |
2261 | # endif |
2277 | # endif |
2262 | } |
2278 | } |
2263 | |
2279 | |
2264 | if (rend & RS_Italic |
2280 | if (rend & RS_Italic && fore == Color_fg) |
2265 | && fore == Color_fg) |
|
|
2266 | { |
2281 | { |
2267 | if (ISSET_PIXCOLOR (Color_IT)) |
2282 | if (ISSET_PIXCOLOR (Color_IT)) |
2268 | fore = Color_IT; |
2283 | fore = Color_IT; |
2269 | # if !ENABLE_STYLES |
2284 | # if !ENABLE_STYLES |
2270 | else |
2285 | else |
2271 | invert = !invert; |
2286 | invert = !invert; |
2272 | # endif |
2287 | # endif |
2273 | } |
2288 | } |
2274 | |
2289 | |
2275 | if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) |
2290 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2276 | fore = Color_UL; |
2291 | fore = Color_UL; |
2277 | #endif |
2292 | #endif |
2278 | |
2293 | |
2279 | if (invert) |
2294 | if (invert) |
2280 | { |
2295 | { |
|
|
2296 | #ifdef OPTION_HC |
|
|
2297 | if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2298 | || !ISSET_PIXCOLOR (Color_HC)) |
|
|
2299 | #endif |
|
|
2300 | /* invert the column if no highlightColor is set or it is the |
|
|
2301 | * current cursor column */ |
2281 | ::swap (fore, back); |
2302 | ::swap (fore, back); |
|
|
2303 | #ifdef OPTION_HC |
|
|
2304 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2305 | back = Color_HC; |
|
|
2306 | #endif |
2282 | |
2307 | |
2283 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2308 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
|
|
2309 | # ifndef OPTION_HC |
2284 | if (ISSET_PIXCOLOR (Color_RV)) |
2310 | if (ISSET_PIXCOLOR (Color_RV)) |
2285 | back = Color_RV; |
2311 | back = Color_RV; |
2286 | |
2312 | # endif |
2287 | if (fore == back) |
2313 | if (fore == back) |
2288 | { |
2314 | { |
2289 | fore = Color_bg; |
2315 | fore = Color_bg; |
2290 | back = Color_fg; |
2316 | back = Color_fg; |
2291 | } |
2317 | } |
… | |
… | |
2293 | } |
2319 | } |
2294 | |
2320 | |
2295 | #ifdef TEXT_BLINK |
2321 | #ifdef TEXT_BLINK |
2296 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2322 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2297 | { |
2323 | { |
2298 | if (!text_blink_ev.active) |
2324 | if (!text_blink_ev.is_active ()) |
2299 | { |
2325 | { |
2300 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
2326 | text_blink_ev.again (); |
2301 | hidden_text = 0; |
2327 | hidden_text = 0; |
2302 | } |
2328 | } |
2303 | else if (hidden_text) |
2329 | else if (hidden_text) |
2304 | fore = back; |
2330 | fore = back; |
2305 | } |
2331 | } |
2306 | #endif |
2332 | #endif |
|
|
2333 | |
|
|
2334 | #if ENABLE_STYLES |
|
|
2335 | // "careful" (too wide) character handling |
|
|
2336 | |
|
|
2337 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2338 | while (text > stp |
|
|
2339 | && srp[text - stp - 1] & RS_Careful |
|
|
2340 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2341 | text--, count++, xpixel -= fwidth; |
|
|
2342 | |
|
|
2343 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2344 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
|
|
2345 | drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw; |
|
|
2346 | |
|
|
2347 | // force redraw before "careful" characters to avoid pixel droppings |
|
|
2348 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
|
|
2349 | drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw; |
|
|
2350 | #endif |
2307 | } |
2351 | } |
2308 | |
2352 | |
2309 | /* |
2353 | /* |
2310 | * Actually do the drawing of the string here |
2354 | * Actually do the drawing of the string here |
2311 | */ |
2355 | */ |
2312 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2356 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2313 | |
2357 | |
2314 | if (back == fore) |
2358 | if (expect_true (have_bg && back == Color_bg)) |
2315 | font->clear_rect (*drawable, xpixel, ypixel, |
|
|
2316 | fwidth * count, fheight, |
|
|
2317 | back); |
|
|
2318 | else if (back == Color_bg) |
|
|
2319 | { |
2359 | { |
2320 | if (must_clear) |
2360 | // this is very ugly, maybe push it into ->draw? |
2321 | { |
|
|
2322 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2323 | |
2361 | |
2324 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2362 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2325 | if (text[i] != ' ') |
2363 | if (text[i] != ' ') |
2326 | { |
2364 | { |
2327 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2365 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent); |
2328 | break; |
2366 | goto did_clear; |
2329 | } |
|
|
2330 | } |
2367 | } |
2331 | else |
2368 | |
2332 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2369 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2370 | did_clear: ; |
2333 | } |
2371 | } |
2334 | else |
2372 | else |
2335 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2373 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2336 | |
2374 | |
2337 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2375 | if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) |
2338 | { |
2376 | { |
2339 | #if ENABLE_FRILLS |
2377 | #if ENABLE_FRILLS |
2340 | if (ISSET_PIXCOLOR (Color_underline)) |
2378 | if (ISSET_PIXCOLOR (Color_underline)) |
2341 | XSetForeground (display->display, gc, pix_colors[Color_underline]); |
2379 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2342 | else |
2380 | else |
2343 | #endif |
2381 | #endif |
2344 | XSetForeground (display->display, gc, pix_colors[fore]); |
2382 | XSetForeground (dpy, gc, pix_colors[fore]); |
2345 | |
2383 | |
2346 | XDrawLine (display->display, drawBuffer, gc, |
2384 | XDrawLine (dpy, vt, gc, |
2347 | xpixel, ypixel + font->ascent + 1, |
2385 | xpixel, ypixel + font->ascent + 1, |
2348 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2386 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2349 | } |
2387 | } |
2350 | } /* for (col....) */ |
2388 | } /* for (col....) */ |
2351 | } /* for (row....) */ |
2389 | } /* for (row....) */ |
… | |
… | |
2360 | */ |
2398 | */ |
2361 | if (showcursor) |
2399 | if (showcursor) |
2362 | { |
2400 | { |
2363 | if (focus) |
2401 | if (focus) |
2364 | { |
2402 | { |
2365 | if (OPTION (Opt_cursorUnderline)) |
2403 | if (option (Opt_cursorUnderline)) |
2366 | *crp ^= RS_Uline; |
2404 | *crp ^= RS_Uline; |
2367 | else |
2405 | else |
2368 | { |
2406 | { |
2369 | *crp ^= RS_RVid; |
2407 | *crp ^= RS_RVid; |
2370 | #ifndef NO_CURSORCOLOR |
2408 | #ifndef NO_CURSORCOLOR |
… | |
… | |
2384 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2422 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2385 | cursorwidth++; |
2423 | cursorwidth++; |
2386 | |
2424 | |
2387 | #ifndef NO_CURSORCOLOR |
2425 | #ifndef NO_CURSORCOLOR |
2388 | if (ISSET_PIXCOLOR (Color_cursor)) |
2426 | if (ISSET_PIXCOLOR (Color_cursor)) |
2389 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
2427 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
|
|
2428 | else |
2390 | #endif |
2429 | #endif |
|
|
2430 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2391 | |
2431 | |
2392 | XDrawRectangle (display->display, drawBuffer, gc, |
2432 | XDrawRectangle (dpy, vt, gc, |
2393 | Col2Pixel (col), |
2433 | Col2Pixel (col), |
2394 | Row2Pixel (oldcursor.row), |
2434 | Row2Pixel (oldcursor.row), |
2395 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2435 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2396 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2436 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2397 | } |
2437 | } |
… | |
… | |
2432 | } |
2472 | } |
2433 | |
2473 | |
2434 | void |
2474 | void |
2435 | rxvt_term::scr_recolour () NOTHROW |
2475 | rxvt_term::scr_recolour () NOTHROW |
2436 | { |
2476 | { |
2437 | if (1 |
2477 | #ifdef HAVE_BG_PIXMAP |
2438 | #if TRANSPARENT |
2478 | bgPixmap.apply (); |
2439 | && !am_transparent |
2479 | #else |
2440 | #endif |
2480 | |
2441 | #if XPM_BACKGROUND |
|
|
2442 | && !bgPixmap.pixmap |
|
|
2443 | #endif |
|
|
2444 | ) |
|
|
2445 | { |
|
|
2446 | XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); |
2481 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2447 | XClearWindow (display->display, parent[0]); |
2482 | XClearWindow (dpy, parent[0]); |
2448 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
2483 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2449 | #if HAVE_SCROLLBARS |
2484 | |
2450 | if (scrollBar.win) |
2485 | if (scrollBar.win) |
2451 | { |
2486 | { |
2452 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
2487 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2453 | scrollBar.setIdle (); |
2488 | scrollBar.state = STATE_IDLE; |
2454 | scrollbar_show (0); |
2489 | scrollBar.show (0); |
2455 | } |
|
|
2456 | #endif |
|
|
2457 | } |
2490 | } |
2458 | |
2491 | |
|
|
2492 | #endif |
|
|
2493 | |
|
|
2494 | /* bgPixmap.apply () does not do the following : */ |
2459 | scr_clear (); |
2495 | scr_clear (); |
2460 | scr_touch (true); |
2496 | scr_touch (true); |
2461 | want_refresh = 1; |
2497 | want_refresh = 1; |
2462 | } |
2498 | } |
2463 | |
2499 | |
… | |
… | |
2470 | |
2506 | |
2471 | num_scr_allow = 0; |
2507 | num_scr_allow = 0; |
2472 | want_refresh = 1; |
2508 | want_refresh = 1; |
2473 | |
2509 | |
2474 | if (really) |
2510 | if (really) |
2475 | XClearWindow (display->display, vt); |
2511 | XClearWindow (dpy, vt); |
2476 | } |
2512 | } |
2477 | |
2513 | |
2478 | void |
2514 | void |
2479 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW |
2515 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW |
2480 | { |
2516 | { |
… | |
… | |
2529 | { |
2565 | { |
2530 | if (selection.op |
2566 | if (selection.op |
2531 | && current_screen == selection.screen |
2567 | && current_screen == selection.screen |
2532 | && selection.end.row >= view_start) |
2568 | && selection.end.row >= view_start) |
2533 | { |
2569 | { |
2534 | #if ENABLE_FRILLS |
2570 | #if !ENABLE_MINIMAL |
2535 | if (selection.rect) |
2571 | if (selection.rect) |
2536 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2572 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2537 | selection.end.row, selection.end.col, |
2573 | selection.end.row, selection.end.col, |
2538 | RS_RVid, RS_RVid | RS_Uline); |
2574 | RS_RVid, RS_RVid | RS_Uline); |
2539 | else |
2575 | else |
… | |
… | |
2555 | { |
2591 | { |
2556 | int row, wrote; |
2592 | int row, wrote; |
2557 | unsigned int width, towrite; |
2593 | unsigned int width, towrite; |
2558 | char r1[] = "\n"; |
2594 | char r1[] = "\n"; |
2559 | |
2595 | |
2560 | for (row = saveLines - nsaved; |
2596 | for (row = saveLines + top_row; |
2561 | row < saveLines + nrow - 1; row++) |
2597 | row < saveLines + nrow - 1; row++) |
2562 | { |
2598 | { |
2563 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2599 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2564 | : ncol; |
2600 | : ncol; |
2565 | for (towrite = width; towrite; towrite -= wrote) |
2601 | for (towrite = width; towrite; towrite -= wrote) |
… | |
… | |
2616 | /* convert normal newline chars into common keyboard Return key sequence */ |
2652 | /* convert normal newline chars into common keyboard Return key sequence */ |
2617 | for (unsigned int i = 0; i < len; i++) |
2653 | for (unsigned int i = 0; i < len; i++) |
2618 | if (data[i] == C0_LF) |
2654 | if (data[i] == C0_LF) |
2619 | data[i] = C0_CR; |
2655 | data[i] = C0_CR; |
2620 | |
2656 | |
|
|
2657 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2658 | tt_printf ("\e[200~"); |
|
|
2659 | |
2621 | tt_write (data, len); |
2660 | tt_write (data, len); |
|
|
2661 | |
|
|
2662 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2663 | tt_printf ("\e[201~"); |
2622 | } |
2664 | } |
2623 | |
2665 | |
2624 | /* ------------------------------------------------------------------------- */ |
2666 | /* ------------------------------------------------------------------------- */ |
2625 | /* |
2667 | /* |
2626 | * Respond to a notification that a primary selection has been sent |
2668 | * Respond to a notification that a primary selection has been sent |
… | |
… | |
2655 | } |
2697 | } |
2656 | |
2698 | |
2657 | unsigned long bytes_after; |
2699 | unsigned long bytes_after; |
2658 | XTextProperty ct; |
2700 | XTextProperty ct; |
2659 | |
2701 | |
2660 | if (XGetWindowProperty (display->display, win, prop, |
2702 | if (XGetWindowProperty (dpy, win, prop, |
2661 | 0, PROP_SIZE / 4, |
2703 | 0, PROP_SIZE / 4, |
2662 | delete_prop, AnyPropertyType, |
2704 | delete_prop, AnyPropertyType, |
2663 | &ct.encoding, &ct.format, |
2705 | &ct.encoding, &ct.format, |
2664 | &ct.nitems, &bytes_after, |
2706 | &ct.nitems, &bytes_after, |
2665 | &ct.value) != Success) |
2707 | &ct.value) != Success) |
… | |
… | |
2674 | if (bytes_after) |
2716 | if (bytes_after) |
2675 | { |
2717 | { |
2676 | // fetch and append remaining data |
2718 | // fetch and append remaining data |
2677 | XTextProperty ct2; |
2719 | XTextProperty ct2; |
2678 | |
2720 | |
2679 | if (XGetWindowProperty (display->display, win, prop, |
2721 | if (XGetWindowProperty (dpy, win, prop, |
2680 | ct.nitems / 4, (bytes_after + 3) / 4, |
2722 | ct.nitems / 4, (bytes_after + 3) / 4, |
2681 | delete_prop, AnyPropertyType, |
2723 | delete_prop, AnyPropertyType, |
2682 | &ct2.encoding, &ct2.format, |
2724 | &ct2.encoding, &ct2.format, |
2683 | &ct2.nitems, &bytes_after, |
2725 | &ct2.nitems, &bytes_after, |
2684 | &ct2.value) != Success) |
2726 | &ct2.value) != Success) |
… | |
… | |
2697 | |
2739 | |
2698 | if (ct.encoding == xa[XA_INCR]) |
2740 | if (ct.encoding == xa[XA_INCR]) |
2699 | { |
2741 | { |
2700 | // INCR selection, start handshake |
2742 | // INCR selection, start handshake |
2701 | if (!delete_prop) |
2743 | if (!delete_prop) |
2702 | XDeleteProperty (display->display, win, prop); |
2744 | XDeleteProperty (dpy, win, prop); |
2703 | |
2745 | |
2704 | selection_wait = Sel_incr; |
2746 | selection_wait = Sel_incr; |
2705 | incr_buf_fill = 0; |
2747 | incr_buf_fill = 0; |
2706 | incr_ev.start (NOW + 10); |
2748 | incr_ev.start (10); |
2707 | |
2749 | |
2708 | goto bailout; |
2750 | goto bailout; |
2709 | } |
2751 | } |
2710 | |
2752 | |
2711 | if (ct.nitems == 0) |
2753 | if (ct.nitems == 0) |
… | |
… | |
2720 | ct.nitems = incr_buf_fill; |
2762 | ct.nitems = incr_buf_fill; |
2721 | incr_buf = 0; |
2763 | incr_buf = 0; |
2722 | incr_buf_size = 0; |
2764 | incr_buf_size = 0; |
2723 | incr_ev.stop (); |
2765 | incr_ev.stop (); |
2724 | } |
2766 | } |
2725 | else |
2767 | else |
2726 | { |
2768 | { |
2727 | if (selection_wait == Sel_normal |
2769 | if (selection_wait == Sel_normal |
2728 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2770 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2729 | { |
2771 | { |
2730 | /* |
2772 | /* |
… | |
… | |
2737 | goto bailout; |
2779 | goto bailout; |
2738 | } |
2780 | } |
2739 | } |
2781 | } |
2740 | else if (selection_wait == Sel_incr) |
2782 | else if (selection_wait == Sel_incr) |
2741 | { |
2783 | { |
2742 | incr_ev.start (NOW + 10); |
2784 | incr_ev.start (10); |
2743 | |
2785 | |
2744 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2786 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2745 | { |
2787 | { |
2746 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2788 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2747 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
2789 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
… | |
… | |
2754 | } |
2796 | } |
2755 | |
2797 | |
2756 | char **cl; |
2798 | char **cl; |
2757 | int cr; |
2799 | int cr; |
2758 | |
2800 | |
2759 | #if ENABLE_FRILLS |
2801 | #if !ENABLE_MINIMAL |
2760 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2802 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2761 | // so recode it manually |
2803 | // so recode it manually |
2762 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2804 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2763 | { |
2805 | { |
2764 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2806 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
… | |
… | |
2768 | paste (s, strlen (s)); |
2810 | paste (s, strlen (s)); |
2769 | free (s); |
2811 | free (s); |
2770 | } |
2812 | } |
2771 | else |
2813 | else |
2772 | #endif |
2814 | #endif |
2773 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2815 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
2774 | && cl) |
2816 | && cl) |
2775 | { |
2817 | { |
2776 | for (int i = 0; i < cr; i++) |
2818 | for (int i = 0; i < cr; i++) |
2777 | paste (cl[i], strlen (cl[i])); |
2819 | paste (cl[i], strlen (cl[i])); |
2778 | |
2820 | |
… | |
… | |
2787 | if (selection_wait == Sel_normal) |
2829 | if (selection_wait == Sel_normal) |
2788 | selection_wait = Sel_none; |
2830 | selection_wait = Sel_none; |
2789 | } |
2831 | } |
2790 | |
2832 | |
2791 | void |
2833 | void |
2792 | rxvt_term::incr_cb (time_watcher &w) NOTHROW |
2834 | rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW |
2793 | { |
2835 | { |
2794 | selection_wait = Sel_none; |
2836 | selection_wait = Sel_none; |
2795 | |
2837 | |
2796 | incr_buf_size = 0; |
2838 | incr_buf_size = 0; |
2797 | free (incr_buf); |
2839 | free (incr_buf); |
… | |
… | |
2808 | selection_paste (win, prop, true); |
2850 | selection_paste (win, prop, true); |
2809 | } |
2851 | } |
2810 | |
2852 | |
2811 | /* ------------------------------------------------------------------------- */ |
2853 | /* ------------------------------------------------------------------------- */ |
2812 | /* |
2854 | /* |
2813 | * Request the current selection: |
2855 | * Request the current selection: |
2814 | * Order: > internal selection if available |
2856 | * Order: > internal selection if available |
2815 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2857 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2816 | * > CUT_BUFFER0 |
2858 | * > CUT_BUFFER0 |
2817 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2859 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2818 | * will auto fallback to CUT_BUFFER0 |
2860 | * will auto fallback to CUT_BUFFER0 |
… | |
… | |
2820 | */ |
2862 | */ |
2821 | void |
2863 | void |
2822 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2864 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2823 | { |
2865 | { |
2824 | if (selection.text && selnum == Sel_Primary) |
2866 | if (selection.text && selnum == Sel_Primary) |
|
|
2867 | { |
2825 | { /* internal selection */ |
2868 | /* internal selection */ |
2826 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2869 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2827 | paste (str, strlen (str)); |
2870 | paste (str, strlen (str)); |
2828 | free (str); |
2871 | free (str); |
2829 | return; |
2872 | return; |
2830 | } |
2873 | } |
… | |
… | |
2860 | else if (selnum == Sel_Secondary) |
2903 | else if (selnum == Sel_Secondary) |
2861 | sel = XA_SECONDARY; |
2904 | sel = XA_SECONDARY; |
2862 | else |
2905 | else |
2863 | sel = xa[XA_CLIPBOARD]; |
2906 | sel = xa[XA_CLIPBOARD]; |
2864 | |
2907 | |
2865 | if (XGetSelectionOwner (display->display, sel) != None) |
2908 | if (XGetSelectionOwner (dpy, sel) != None) |
2866 | { |
2909 | { |
2867 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2910 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
2868 | vt, selection_request_time); |
2911 | vt, selection_request_time); |
2869 | return 1; |
2912 | return 1; |
2870 | } |
2913 | } |
2871 | |
2914 | |
2872 | return 0; |
2915 | return 0; |
… | |
… | |
2935 | |
2978 | |
2936 | int end_col; |
2979 | int end_col; |
2937 | |
2980 | |
2938 | for (; row <= selection.end.row; row++, col = 0) |
2981 | for (; row <= selection.end.row; row++, col = 0) |
2939 | { |
2982 | { |
2940 | #if ENABLE_FRILLS |
2983 | #if !ENABLE_MINIMAL |
2941 | if (selection.rect) |
2984 | if (selection.rect) |
2942 | { |
2985 | { |
2943 | col = selection.beg.col; |
2986 | col = selection.beg.col; |
2944 | end_col = ncol + 1; |
2987 | end_col = ncol + 1; |
2945 | } |
2988 | } |
… | |
… | |
2948 | end_col = ROW(row).l; |
2991 | end_col = ROW(row).l; |
2949 | |
2992 | |
2950 | col = max (col, 0); |
2993 | col = max (col, 0); |
2951 | |
2994 | |
2952 | if (row == selection.end.row |
2995 | if (row == selection.end.row |
2953 | #if ENABLE_FRILLS |
2996 | #if !ENABLE_MINIMAL |
2954 | || selection.rect |
2997 | || selection.rect |
2955 | #endif |
2998 | #endif |
2956 | ) |
2999 | ) |
2957 | min_it (end_col, selection.end.col); |
3000 | min_it (end_col, selection.end.col); |
2958 | |
3001 | |
… | |
… | |
2981 | #endif |
3024 | #endif |
2982 | else |
3025 | else |
2983 | new_selection_text[ofs++] = *t++; |
3026 | new_selection_text[ofs++] = *t++; |
2984 | } |
3027 | } |
2985 | |
3028 | |
2986 | #if ENABLE_FRILLS |
3029 | #if !ENABLE_MINIMAL |
2987 | if (selection.rect) |
3030 | if (selection.rect) |
2988 | { |
3031 | { |
2989 | while (ofs |
3032 | while (ofs |
2990 | && new_selection_text[ofs - 1] != C0_LF |
3033 | && new_selection_text[ofs - 1] != C0_LF |
2991 | && unicode::is_space (new_selection_text[ofs - 1])) |
3034 | && unicode::is_space (new_selection_text[ofs - 1])) |
… | |
… | |
3025 | bool |
3068 | bool |
3026 | rxvt_term::selection_grab (Time tm) NOTHROW |
3069 | rxvt_term::selection_grab (Time tm) NOTHROW |
3027 | { |
3070 | { |
3028 | selection_time = tm; |
3071 | selection_time = tm; |
3029 | |
3072 | |
3030 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
3073 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
3031 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
3074 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
3032 | { |
3075 | { |
3033 | display->set_selection_owner (this); |
3076 | display->set_selection_owner (this); |
3034 | return true; |
3077 | return true; |
3035 | } |
3078 | } |
3036 | else |
3079 | else |
… | |
… | |
3040 | } |
3083 | } |
3041 | |
3084 | |
3042 | #if 0 |
3085 | #if 0 |
3043 | XTextProperty ct; |
3086 | XTextProperty ct; |
3044 | |
3087 | |
3045 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3088 | if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0) |
3046 | { |
3089 | { |
3047 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3090 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3048 | XFree (ct.value); |
3091 | XFree (ct.value); |
3049 | } |
3092 | } |
3050 | #endif |
3093 | #endif |
… | |
… | |
3096 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3139 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3097 | |
3140 | |
3098 | while (selection.mark.col > 0 |
3141 | while (selection.mark.col > 0 |
3099 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3142 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3100 | --selection.mark.col; |
3143 | --selection.mark.col; |
3101 | |
3144 | |
3102 | if (selection.op) |
3145 | if (selection.op) |
|
|
3146 | { |
3103 | { /* clear the old selection */ |
3147 | /* clear the old selection */ |
3104 | selection.beg.row = selection.end.row = selection.mark.row; |
3148 | selection.beg.row = selection.end.row = selection.mark.row; |
3105 | selection.beg.col = selection.end.col = selection.mark.col; |
3149 | selection.beg.col = selection.end.col = selection.mark.col; |
3106 | } |
3150 | } |
3107 | |
3151 | |
3108 | selection.op = SELECTION_INIT; |
3152 | selection.op = SELECTION_INIT; |
… | |
… | |
3297 | * a point/word/line which is either the start or end of the selection |
3341 | * a point/word/line which is either the start or end of the selection |
3298 | * and it was decided by whichever point/word/line was `fixed' at the |
3342 | * and it was decided by whichever point/word/line was `fixed' at the |
3299 | * time of the most recent button3 press |
3343 | * time of the most recent button3 press |
3300 | */ |
3344 | */ |
3301 | if (button3 && buttonpress) |
3345 | if (button3 && buttonpress) |
|
|
3346 | { |
3302 | { /* button3 press */ |
3347 | /* button3 press */ |
3303 | /* |
3348 | /* |
3304 | * first determine which edge of the selection we are closest to |
3349 | * first determine which edge of the selection we are closest to |
3305 | */ |
3350 | */ |
3306 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3351 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3307 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
3352 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
… | |
… | |
3325 | selection.mark.row = selection.beg.row; |
3370 | selection.mark.row = selection.beg.row; |
3326 | selection.mark.col = selection.beg.col; |
3371 | selection.mark.col = selection.beg.col; |
3327 | } |
3372 | } |
3328 | } |
3373 | } |
3329 | else |
3374 | else |
|
|
3375 | { |
3330 | { /* button1 drag or button3 drag */ |
3376 | /* button1 drag or button3 drag */ |
3331 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3377 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3332 | { |
3378 | { |
3333 | if (selection.mark.row == selection.end.row |
3379 | if (selection.mark.row == selection.end.row |
3334 | && selection.mark.col == selection.end.col |
3380 | && selection.mark.col == selection.end.col |
3335 | && clickchange |
3381 | && clickchange |
… | |
… | |
3352 | |
3398 | |
3353 | if (selection.clicks == 1) |
3399 | if (selection.clicks == 1) |
3354 | { |
3400 | { |
3355 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3401 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3356 | && !ROW(selection.beg.row).is_longer () |
3402 | && !ROW(selection.beg.row).is_longer () |
3357 | #if ENABLE_FRILLS |
3403 | #if !ENABLE_MINIMAL |
3358 | && !selection.rect |
3404 | && !selection.rect |
3359 | #endif |
3405 | #endif |
3360 | ) |
3406 | ) |
3361 | selection.beg.col = ncol; |
3407 | selection.beg.col = ncol; |
3362 | |
3408 | |
3363 | if ( |
3409 | if ( |
3364 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3410 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3365 | && !ROW(selection.end.row).is_longer () |
3411 | && !ROW(selection.end.row).is_longer () |
3366 | #if ENABLE_FRILLS |
3412 | #if !ENABLE_MINIMAL |
3367 | && !selection.rect |
3413 | && !selection.rect |
3368 | #endif |
3414 | #endif |
3369 | ) |
3415 | ) |
3370 | selection.end.col = ncol; |
3416 | selection.end.col = ncol; |
3371 | } |
3417 | } |
… | |
… | |
3378 | selection_delimit_word (DN, &selection.end, &selection.end); |
3424 | selection_delimit_word (DN, &selection.end, &selection.end); |
3379 | } |
3425 | } |
3380 | else if (selection.clicks == 3) |
3426 | else if (selection.clicks == 3) |
3381 | { |
3427 | { |
3382 | #if ENABLE_FRILLS |
3428 | #if ENABLE_FRILLS |
3383 | if (OPTION (Opt_tripleclickwords)) |
3429 | if (option (Opt_tripleclickwords)) |
3384 | { |
3430 | { |
3385 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3431 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3386 | |
3432 | |
3387 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3433 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3388 | { |
3434 | { |
3389 | if (!ROW(end_row).is_longer ()) |
3435 | if (!ROW(end_row).is_longer ()) |
3390 | { |
3436 | { |
3391 | selection.end.row = end_row; |
3437 | selection.end.row = end_row; |
3392 | selection.end.col = ROW(end_row).l; |
3438 | selection.end.col = ROW(end_row).l; |
|
|
3439 | # if !ENABLE_MINIMAL |
3393 | selection_remove_trailing_spaces (); |
3440 | selection_remove_trailing_spaces (); |
|
|
3441 | # endif |
3394 | break; |
3442 | break; |
3395 | } |
3443 | } |
3396 | } |
3444 | } |
3397 | } |
3445 | } |
3398 | else |
3446 | else |
… | |
… | |
3414 | selection.end.row++; |
3462 | selection.end.row++; |
3415 | } |
3463 | } |
3416 | } |
3464 | } |
3417 | |
3465 | |
3418 | if (button3 && buttonpress) |
3466 | if (button3 && buttonpress) |
|
|
3467 | { |
3419 | { /* mark may need to be changed */ |
3468 | /* mark may need to be changed */ |
3420 | if (closeto == LEFT) |
3469 | if (closeto == LEFT) |
3421 | { |
3470 | { |
3422 | selection.mark.row = selection.end.row; |
3471 | selection.mark.row = selection.end.row; |
3423 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3472 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3424 | } |
3473 | } |
… | |
… | |
3427 | selection.mark.row = selection.beg.row; |
3476 | selection.mark.row = selection.beg.row; |
3428 | selection.mark.col = selection.beg.col; |
3477 | selection.mark.col = selection.beg.col; |
3429 | } |
3478 | } |
3430 | } |
3479 | } |
3431 | |
3480 | |
3432 | #if ENABLE_FRILLS |
3481 | #if !ENABLE_MINIMAL |
3433 | if (selection.rect && selection.beg.col > selection.end.col) |
3482 | if (selection.rect && selection.beg.col > selection.end.col) |
3434 | ::swap (selection.beg.col, selection.end.col); |
3483 | ::swap (selection.beg.col, selection.end.col); |
3435 | #endif |
3484 | #endif |
3436 | } |
3485 | } |
3437 | |
3486 | |
3438 | #if ENABLE_FRILLS |
3487 | #if !ENABLE_MINIMAL |
3439 | void |
3488 | void |
3440 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3489 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3441 | { |
3490 | { |
3442 | int32_t end_col, end_row; |
3491 | int32_t end_col, end_row; |
3443 | text_t *stp; |
3492 | text_t *stp; |
… | |
… | |
3498 | */ |
3547 | */ |
3499 | void |
3548 | void |
3500 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3549 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3501 | { |
3550 | { |
3502 | XSelectionEvent ev; |
3551 | XSelectionEvent ev; |
3503 | dDisp; |
|
|
3504 | |
3552 | |
3505 | ev.type = SelectionNotify; |
3553 | ev.type = SelectionNotify; |
3506 | ev.property = None; |
3554 | ev.property = None; |
3507 | ev.display = rq.display; |
3555 | ev.display = rq.display; |
3508 | ev.requestor = rq.requestor; |
3556 | ev.requestor = rq.requestor; |
… | |
… | |
3522 | *target++ = xa[XA_COMPOUND_TEXT]; |
3570 | *target++ = xa[XA_COMPOUND_TEXT]; |
3523 | #if X_HAVE_UTF8_STRING |
3571 | #if X_HAVE_UTF8_STRING |
3524 | *target++ = xa[XA_UTF8_STRING]; |
3572 | *target++ = xa[XA_UTF8_STRING]; |
3525 | #endif |
3573 | #endif |
3526 | |
3574 | |
3527 | XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, |
3575 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3528 | 32, PropModeReplace, |
3576 | 32, PropModeReplace, |
3529 | (unsigned char *)target_list, target - target_list); |
3577 | (unsigned char *)target_list, target - target_list); |
3530 | ev.property = rq.property; |
3578 | ev.property = rq.property; |
3531 | } |
3579 | } |
3532 | #if TODO // TODO |
3580 | #if TODO // TODO |
… | |
… | |
3535 | /* TODO: Handle MULTIPLE */ |
3583 | /* TODO: Handle MULTIPLE */ |
3536 | } |
3584 | } |
3537 | #endif |
3585 | #endif |
3538 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3586 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3539 | { |
3587 | { |
3540 | XChangeProperty (disp, rq.requestor, rq.property, rq.target, |
3588 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3541 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3589 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3542 | ev.property = rq.property; |
3590 | ev.property = rq.property; |
3543 | } |
3591 | } |
3544 | else if (rq.target == XA_STRING |
3592 | else if (rq.target == XA_STRING |
3545 | || rq.target == xa[XA_TEXT] |
3593 | || rq.target == xa[XA_TEXT] |
… | |
… | |
3569 | style = enc_string; |
3617 | style = enc_string; |
3570 | else if (target == xa[XA_TEXT]) |
3618 | else if (target == xa[XA_TEXT]) |
3571 | style = enc_text; |
3619 | style = enc_text; |
3572 | else if (target == xa[XA_COMPOUND_TEXT]) |
3620 | else if (target == xa[XA_COMPOUND_TEXT]) |
3573 | style = enc_compound_text; |
3621 | style = enc_compound_text; |
3574 | #if ENABLE_FRILLS |
3622 | #if !ENABLE_MINIMAL |
3575 | else if (target == xa[XA_UTF8_STRING]) |
3623 | else if (target == xa[XA_UTF8_STRING]) |
3576 | style = enc_utf8; |
3624 | style = enc_utf8; |
3577 | #endif |
3625 | #endif |
3578 | else |
3626 | else |
3579 | { |
3627 | { |
… | |
… | |
3590 | { |
3638 | { |
3591 | cl = L""; |
3639 | cl = L""; |
3592 | selectlen = 0; |
3640 | selectlen = 0; |
3593 | } |
3641 | } |
3594 | |
3642 | |
3595 | #if ENABLE_FRILLS |
3643 | #if !ENABLE_MINIMAL |
3596 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3644 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3597 | // so recode it manually |
3645 | // so recode it manually |
3598 | if (style == enc_utf8) |
3646 | if (style == enc_utf8) |
3599 | { |
3647 | { |
3600 | freect = 1; |
3648 | freect = 1; |
… | |
… | |
3603 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3651 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3604 | ct.nitems = strlen ((char *)ct.value); |
3652 | ct.nitems = strlen ((char *)ct.value); |
3605 | } |
3653 | } |
3606 | else |
3654 | else |
3607 | #endif |
3655 | #endif |
3608 | if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3656 | if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3609 | freect = 1; |
3657 | freect = 1; |
3610 | else |
3658 | else |
3611 | { |
3659 | { |
3612 | /* if we failed to convert then send it raw */ |
3660 | /* if we failed to convert then send it raw */ |
3613 | ct.value = (unsigned char *)cl; |
3661 | ct.value = (unsigned char *)cl; |
3614 | ct.nitems = selectlen; |
3662 | ct.nitems = selectlen; |
3615 | ct.encoding = target; |
3663 | ct.encoding = target; |
3616 | } |
3664 | } |
3617 | |
3665 | |
3618 | XChangeProperty (disp, rq.requestor, rq.property, |
3666 | XChangeProperty (dpy, rq.requestor, rq.property, |
3619 | ct.encoding, 8, PropModeReplace, |
3667 | ct.encoding, 8, PropModeReplace, |
3620 | ct.value, (int)ct.nitems); |
3668 | ct.value, (int)ct.nitems); |
3621 | ev.property = rq.property; |
3669 | ev.property = rq.property; |
3622 | |
3670 | |
3623 | if (freect) |
3671 | if (freect) |
3624 | XFree (ct.value); |
3672 | XFree (ct.value); |
3625 | } |
3673 | } |
3626 | |
3674 | |
3627 | XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); |
3675 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3628 | } |
|
|
3629 | |
|
|
3630 | /* ------------------------------------------------------------------------- * |
|
|
3631 | * MOUSE ROUTINES * |
|
|
3632 | * ------------------------------------------------------------------------- */ |
|
|
3633 | |
|
|
3634 | /* |
|
|
3635 | * return col/row values corresponding to x/y pixel values |
|
|
3636 | */ |
|
|
3637 | void |
|
|
3638 | rxvt_term::pixel_position (int *x, int *y) NOTHROW |
|
|
3639 | { |
|
|
3640 | *x = Pixel2Col (*x); |
|
|
3641 | /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ |
|
|
3642 | *y = Pixel2Row (*y); |
|
|
3643 | /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ |
|
|
3644 | } |
3676 | } |
3645 | |
3677 | |
3646 | /* ------------------------------------------------------------------------- */ |
3678 | /* ------------------------------------------------------------------------- */ |
3647 | #ifdef USE_XIM |
3679 | #ifdef USE_XIM |
3648 | void |
3680 | void |
3649 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3681 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3650 | { |
3682 | { |
3651 | XWindowAttributes xwa; |
3683 | XWindowAttributes xwa; |
3652 | |
3684 | |
3653 | XGetWindowAttributes (display->display, vt, &xwa); |
3685 | XGetWindowAttributes (dpy, vt, &xwa); |
3654 | |
3686 | |
3655 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3687 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3656 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3688 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3657 | } |
3689 | } |
3658 | #endif |
3690 | #endif |
… | |
… | |
3754 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW |
3786 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW |
3755 | { |
3787 | { |
3756 | while (*s) |
3788 | while (*s) |
3757 | { |
3789 | { |
3758 | text_t t = *s++; |
3790 | text_t t = *s++; |
3759 | int width = wcwidth (t); |
3791 | int width = WCWIDTH (t); |
3760 | |
3792 | |
3761 | while (width--) |
3793 | while (width--) |
3762 | { |
3794 | { |
3763 | scr_overlay_set (x++, y, t); |
3795 | scr_overlay_set (x++, y, t); |
3764 | t = NOCHAR; |
3796 | t = NOCHAR; |