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 | |
118 | /* Fill part/all of a line with blanks. */ |
100 | /* Fill part/all of a line with blanks. */ |
119 | void |
101 | void |
120 | rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const |
102 | rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW |
121 | { |
103 | { |
122 | if (!l.t) |
104 | if (!l.t) |
123 | { |
105 | { |
124 | lalloc (l); |
106 | lalloc (l); |
125 | col = 0; |
107 | col = 0; |
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 | |
… | |
… | |
142 | } |
124 | } |
143 | |
125 | |
144 | /* ------------------------------------------------------------------------- */ |
126 | /* ------------------------------------------------------------------------- */ |
145 | /* Fill a full line with blanks - make sure it is allocated first */ |
127 | /* Fill a full line with blanks - make sure it is allocated first */ |
146 | void |
128 | void |
147 | rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const |
129 | rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW |
148 | { |
130 | { |
149 | scr_blank_line (l, 0, ncol, efs); |
131 | scr_blank_line (l, 0, ncol, efs); |
150 | |
132 | |
151 | l.l = 0; |
133 | l.l = 0; |
152 | l.f = 0; |
134 | l.f = 0; |
|
|
135 | } |
|
|
136 | |
|
|
137 | // nuke a single wide character at the given column |
|
|
138 | void |
|
|
139 | rxvt_term::scr_kill_char (line_t &l, int col) const NOTHROW |
|
|
140 | { |
|
|
141 | // find begin |
|
|
142 | while (col > 0 && l.t[col] == NOCHAR) |
|
|
143 | col--; |
|
|
144 | |
|
|
145 | rend_t rend = l.r[col] & ~RS_baseattrMask; |
|
|
146 | rend = SET_FONT (rend, FONTSET (rend)->find_font (' ')); |
|
|
147 | |
|
|
148 | // found begin, nuke |
|
|
149 | do { |
|
|
150 | l.t[col] = ' '; |
|
|
151 | l.r[col] = rend; |
|
|
152 | col++; |
|
|
153 | } while (col < ncol && l.t[col] == NOCHAR); |
153 | } |
154 | } |
154 | |
155 | |
155 | /* ------------------------------------------------------------------------- * |
156 | /* ------------------------------------------------------------------------- * |
156 | * SCREEN INITIALISATION * |
157 | * SCREEN INITIALISATION * |
157 | * ------------------------------------------------------------------------- */ |
158 | * ------------------------------------------------------------------------- */ |
… | |
… | |
161 | { |
162 | { |
162 | #if ENABLE_OVERLAY |
163 | #if ENABLE_OVERLAY |
163 | scr_overlay_off (); |
164 | scr_overlay_off (); |
164 | #endif |
165 | #endif |
165 | |
166 | |
|
|
167 | rvideo_mode = false; |
166 | view_start = 0; |
168 | view_start = 0; |
167 | num_scr = 0; |
169 | num_scr = 0; |
168 | |
170 | |
169 | if (ncol == 0) |
171 | if (ncol == 0) |
170 | ncol = 80; |
172 | ncol = 80; |
… | |
… | |
173 | nrow = 24; |
175 | nrow = 24; |
174 | |
176 | |
175 | if (ncol == prev_ncol && nrow == prev_nrow) |
177 | if (ncol == prev_ncol && nrow == prev_nrow) |
176 | return; |
178 | return; |
177 | |
179 | |
|
|
180 | if (current_screen != PRIMARY) |
|
|
181 | scr_swap_screen (); |
|
|
182 | |
178 | // we need at least two lines for wrapping to work correctly |
183 | // we need at least two lines for wrapping to work correctly |
179 | if (nrow + saveLines < 2) |
184 | while (nrow + saveLines < 2) |
180 | { |
185 | { |
181 | //TODO//FIXME |
186 | //TODO//FIXME |
182 | saveLines++; |
187 | saveLines++; |
183 | prev_nrow--; |
188 | prev_nrow--; |
184 | top_row--; |
189 | top_row--; |
… | |
… | |
195 | if (!row_buf) |
200 | if (!row_buf) |
196 | { |
201 | { |
197 | /* |
202 | /* |
198 | * first time called so just malloc everything: don't rely on realloc |
203 | * first time called so just malloc everything: don't rely on realloc |
199 | */ |
204 | */ |
200 | top_row = 0; /* no saved lines */ |
205 | top_row = 0; |
201 | term_start = 0; |
206 | term_start = 0; |
202 | |
207 | |
203 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
208 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
204 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
209 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
205 | |
210 | |
… | |
… | |
234 | selection.text = NULL; |
239 | selection.text = NULL; |
235 | selection.len = 0; |
240 | selection.len = 0; |
236 | selection.op = SELECTION_CLEAR; |
241 | selection.op = SELECTION_CLEAR; |
237 | selection.screen = PRIMARY; |
242 | selection.screen = PRIMARY; |
238 | selection.clicks = 0; |
243 | selection.clicks = 0; |
239 | CLEAR_ALL_SELECTION (); |
|
|
240 | rvideo = 0; |
|
|
241 | } |
244 | } |
242 | else |
245 | else |
243 | { |
246 | { |
244 | /* |
247 | /* |
245 | * add or delete rows as appropriate |
248 | * add or delete rows as appropriate |
… | |
… | |
274 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
277 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
275 | } |
278 | } |
276 | |
279 | |
277 | line_t *old_buf = row_buf; |
280 | line_t *old_buf = row_buf; |
278 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
281 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
279 | |
282 | |
280 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
283 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
281 | int pend = MOD (term_start + top_row , prev_total_rows); |
284 | int pend = MOD (term_start + top_row , prev_total_rows); |
282 | int q = total_rows; // rewrapped row |
285 | int q = total_rows; // rewrapped row |
283 | |
286 | |
284 | if (top_row) |
287 | if (top_row) |
285 | { |
288 | { |
286 | // re-wrap lines, this is rather ugly, possibly because I am too dumb |
289 | // Re-wrap lines. This is rather ugly, possibly because I am too dumb |
287 | // to come up with a lean and mean algorithm. |
290 | // to come up with a lean and mean algorithm. |
288 | |
291 | |
289 | row_col_t ocur = screen.cur; |
292 | row_col_t ocur = screen.cur; |
290 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
293 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
291 | |
294 | |
… | |
… | |
325 | qline->l = ncol; |
328 | qline->l = ncol; |
326 | qline->is_longer (1); |
329 | qline->is_longer (1); |
327 | |
330 | |
328 | int qcol = 0; |
331 | int qcol = 0; |
329 | |
332 | |
|
|
333 | // see below for cursor adjustment rationale |
|
|
334 | if (p == ocur.row) |
|
|
335 | screen.cur.row = q - (total_rows - nrow); |
|
|
336 | |
330 | // fill a single destination line |
337 | // fill a single destination line |
331 | while (lofs < llen && qcol < ncol) |
338 | while (lofs < llen && qcol < ncol) |
332 | { |
339 | { |
333 | int prow = lofs / prev_ncol; |
340 | int prow = lofs / prev_ncol; |
334 | int pcol = lofs % prev_ncol; |
341 | int pcol = lofs % prev_ncol; |
… | |
… | |
344 | |
351 | |
345 | line_t &pline = old_buf [prow]; |
352 | line_t &pline = old_buf [prow]; |
346 | |
353 | |
347 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
354 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
348 | |
355 | |
349 | assert (len); |
|
|
350 | assert (pline.t); |
|
|
351 | |
|
|
352 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
356 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
353 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
357 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
354 | |
358 | |
355 | lofs += len; |
359 | lofs += len; |
356 | qcol += len; |
360 | qcol += len; |
… | |
… | |
363 | } |
367 | } |
364 | while (p != pend && q > 0); |
368 | while (p != pend && q > 0); |
365 | |
369 | |
366 | term_start = total_rows - nrow; |
370 | term_start = total_rows - nrow; |
367 | top_row = q - term_start; |
371 | top_row = q - term_start; |
368 | |
372 | |
369 | // make sure all terminal lines exist |
373 | // make sure all terminal lines exist |
370 | while (top_row > 0) |
374 | while (top_row > 0) |
371 | scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); |
375 | scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); |
372 | } |
376 | } |
373 | else |
377 | else |
374 | { |
378 | { |
375 | // if no scrollback exists (yet), wing, instead of wrap |
379 | // if no scrollback exists (yet), wing, instead of wrap |
376 | |
380 | |
377 | for (int row = min (nrow, prev_nrow); row--; ) |
381 | for (int row = min (nrow, prev_nrow); row--; ) |
378 | { |
382 | { |
379 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
383 | line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)]; |
380 | line_t &qline = row_buf [row]; |
384 | line_t &qline = row_buf [row]; |
381 | |
385 | |
… | |
… | |
389 | } |
393 | } |
390 | |
394 | |
391 | term_start = 0; |
395 | term_start = 0; |
392 | } |
396 | } |
393 | |
397 | |
394 | #ifdef DEBUG_STRICT //TODO: remove |
|
|
395 | for (int i = top_row; i < nrow; i++) |
|
|
396 | assert (ROW (i).t); |
|
|
397 | #endif |
|
|
398 | |
|
|
399 | free (old_buf); |
398 | free (old_buf); |
400 | delete old_ta; |
399 | delete old_ta; |
401 | delete old_ra; |
400 | delete old_ra; |
402 | |
401 | |
403 | clamp_it (screen.cur.row, 0, nrow - 1); |
402 | clamp_it (screen.cur.row, 0, nrow - 1); |
404 | clamp_it (screen.cur.col, 0, ncol - 1); |
403 | clamp_it (screen.cur.col, 0, ncol - 1); |
405 | |
404 | |
406 | if (tabs) |
|
|
407 | free (tabs); |
405 | free (tabs); |
408 | } |
406 | } |
|
|
407 | |
|
|
408 | CLEAR_ALL_SELECTION (); |
409 | |
409 | |
410 | prev_nrow = nrow; |
410 | prev_nrow = nrow; |
411 | prev_ncol = ncol; |
411 | prev_ncol = ncol; |
412 | |
412 | |
413 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
413 | tabs = (char *)rxvt_malloc (ncol); |
414 | |
414 | |
415 | for (int col = ncol; col--; ) |
415 | for (int col = ncol; --col; ) |
416 | tabs [col] = col % TABSIZE == 0; |
416 | tabs [col] = col % TABSIZE == 0; |
417 | |
417 | |
|
|
418 | if (current_screen != PRIMARY) |
|
|
419 | scr_swap_screen (); |
|
|
420 | |
418 | tt_winch (); |
421 | tt_winch (); |
419 | |
422 | |
420 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
423 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
421 | } |
424 | } |
422 | |
425 | |
423 | /* ------------------------------------------------------------------------- */ |
426 | /* ------------------------------------------------------------------------- */ |
424 | /* |
427 | /* |
425 | * Free everything. That way malloc debugging can find leakage. |
428 | * Free everything. That way malloc debugging can find leakage. |
426 | */ |
429 | */ |
427 | void |
430 | void |
428 | rxvt_term::scr_release () |
431 | rxvt_term::scr_release () NOTHROW |
429 | { |
432 | { |
|
|
433 | if (row_buf) |
|
|
434 | { |
430 | delete talloc; talloc = 0; |
435 | delete talloc; talloc = 0; |
431 | delete ralloc; ralloc = 0; |
436 | delete ralloc; ralloc = 0; |
432 | |
437 | |
433 | free (row_buf); |
438 | free (row_buf); |
434 | free (swap_buf); |
439 | free (swap_buf); |
435 | free (drawn_buf); |
440 | free (drawn_buf); |
436 | free (tabs); |
441 | free (tabs); |
437 | |
442 | |
438 | row_buf = 0; // signal that we freed all the arrays |
443 | row_buf = 0; // signal that we freed all the arrays |
|
|
444 | } |
439 | } |
445 | } |
440 | |
446 | |
441 | /* ------------------------------------------------------------------------- */ |
447 | /* ------------------------------------------------------------------------- */ |
442 | /* |
448 | /* |
443 | * Hard reset |
449 | * Hard reset |
… | |
… | |
448 | scr_release (); |
454 | scr_release (); |
449 | prev_nrow = prev_ncol = 0; |
455 | prev_nrow = prev_ncol = 0; |
450 | scr_reset (); |
456 | scr_reset (); |
451 | |
457 | |
452 | scr_clear (true); |
458 | scr_clear (true); |
453 | scr_refresh (SLOW_REFRESH); |
459 | scr_refresh (); |
454 | } |
460 | } |
455 | |
461 | |
456 | /* ------------------------------------------------------------------------- * |
462 | /* ------------------------------------------------------------------------- * |
457 | * PROCESS SCREEN COMMANDS * |
463 | * PROCESS SCREEN COMMANDS * |
458 | * ------------------------------------------------------------------------- */ |
464 | * ------------------------------------------------------------------------- */ |
… | |
… | |
460 | * Save and Restore cursor |
466 | * Save and Restore cursor |
461 | * XTERM_SEQ: Save cursor : ESC 7 |
467 | * XTERM_SEQ: Save cursor : ESC 7 |
462 | * XTERM_SEQ: Restore cursor: ESC 8 |
468 | * XTERM_SEQ: Restore cursor: ESC 8 |
463 | */ |
469 | */ |
464 | void |
470 | void |
465 | rxvt_term::scr_cursor (int mode) |
471 | rxvt_term::scr_cursor (cursor_mode mode) NOTHROW |
466 | { |
472 | { |
467 | screen_t *s; |
473 | screen_t *s; |
468 | |
474 | |
469 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
475 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
470 | if (current_screen == SECONDARY) |
476 | if (current_screen == SECONDARY) |
… | |
… | |
502 | assert (s->cur.row >= 0); |
508 | assert (s->cur.row >= 0); |
503 | assert (s->cur.col >= 0); |
509 | assert (s->cur.col >= 0); |
504 | #endif |
510 | #endif |
505 | } |
511 | } |
506 | |
512 | |
|
|
513 | void |
|
|
514 | rxvt_term::scr_swap_screen () |
|
|
515 | { |
|
|
516 | if (!option (Opt_secondaryScreen)) |
|
|
517 | return; |
|
|
518 | |
|
|
519 | for (int i = prev_nrow; i--; ) |
|
|
520 | ::swap (ROW(i), swap_buf [i]); |
|
|
521 | |
|
|
522 | ::swap (screen.cur, swap.cur); |
|
|
523 | |
|
|
524 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
|
|
525 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
|
|
526 | } |
|
|
527 | |
507 | /* ------------------------------------------------------------------------- */ |
528 | /* ------------------------------------------------------------------------- */ |
508 | /* |
529 | /* |
509 | * Swap between primary and secondary screens |
530 | * Swap between primary and secondary screens |
510 | * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h |
531 | * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h |
511 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
532 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
512 | */ |
533 | */ |
513 | int |
534 | void |
514 | rxvt_term::scr_change_screen (int scrn) |
535 | rxvt_term::scr_change_screen (int scrn) |
515 | { |
536 | { |
|
|
537 | if (scrn == current_screen) |
|
|
538 | return; |
|
|
539 | |
516 | want_refresh = 1; |
540 | want_refresh = 1; |
517 | view_start = 0; |
541 | view_start = 0; |
518 | |
542 | |
519 | if (current_screen == scrn) |
|
|
520 | return scrn; |
|
|
521 | |
|
|
522 | selection_check (2); /* check for boundary cross */ |
543 | selection_check (2); /* check for boundary cross */ |
523 | |
544 | |
524 | int i = current_screen; current_screen = scrn; scrn = i; |
545 | int i = current_screen; current_screen = scrn; scrn = i; |
525 | |
546 | |
526 | ::swap (screen.cur.row, swap.cur.row); |
|
|
527 | ::swap (screen.cur.col, swap.cur.col); |
|
|
528 | |
|
|
529 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
|
|
530 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
|
|
531 | |
|
|
532 | #if NSCREENS |
547 | #if NSCREENS |
533 | if (OPTION (Opt_secondaryScreen)) |
548 | if (option (Opt_secondaryScreen)) |
534 | { |
549 | { |
535 | num_scr = 0; |
550 | num_scr = 0; |
536 | |
551 | |
537 | for (int i = prev_nrow; i--; ) |
552 | scr_swap_screen (); |
538 | ::swap (ROW(i), swap_buf [i]); |
|
|
539 | |
553 | |
540 | ::swap (screen.charset, swap.charset); |
554 | ::swap (screen.charset, swap.charset); |
541 | ::swap (screen.flags, swap.flags); |
555 | ::swap (screen.flags, swap.flags); |
542 | screen.flags |= Screen_VisibleCursor; |
556 | screen.flags |= Screen_VisibleCursor; |
543 | swap.flags |= Screen_VisibleCursor; |
557 | swap.flags |= Screen_VisibleCursor; |
544 | } |
558 | } |
545 | else |
559 | else |
546 | #endif |
560 | #endif |
547 | if (OPTION (Opt_secondaryScroll)) |
561 | if (option (Opt_secondaryScroll)) |
548 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
562 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
549 | |
|
|
550 | return scrn; |
|
|
551 | } |
563 | } |
552 | |
564 | |
553 | // clear WrapNext indicator, solidifying position on next line |
565 | // clear WrapNext indicator, solidifying position on next line |
554 | void |
566 | void |
555 | rxvt_term::scr_do_wrap () |
567 | rxvt_term::scr_do_wrap () NOTHROW |
556 | { |
568 | { |
557 | if (!(screen.flags & Screen_WrapNext)) |
569 | if (!(screen.flags & Screen_WrapNext)) |
558 | return; |
570 | return; |
559 | |
571 | |
560 | screen.flags &= ~Screen_WrapNext; |
572 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
570 | /* ------------------------------------------------------------------------- */ |
582 | /* ------------------------------------------------------------------------- */ |
571 | /* |
583 | /* |
572 | * Change the colour for following text |
584 | * Change the colour for following text |
573 | */ |
585 | */ |
574 | void |
586 | void |
575 | rxvt_term::scr_color (unsigned int color, int fgbg) |
587 | rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW |
576 | { |
588 | { |
577 | if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) |
589 | if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) |
578 | color = fgbg; |
590 | color = fgbg; |
579 | |
591 | |
580 | if (fgbg == Color_fg) |
592 | if (fgbg == Color_fg) |
… | |
… | |
586 | /* ------------------------------------------------------------------------- */ |
598 | /* ------------------------------------------------------------------------- */ |
587 | /* |
599 | /* |
588 | * Change the rendition style for following text |
600 | * Change the rendition style for following text |
589 | */ |
601 | */ |
590 | void |
602 | void |
591 | rxvt_term::scr_rendition (int set, int style) |
603 | rxvt_term::scr_rendition (int set, int style) NOTHROW |
592 | { |
604 | { |
593 | if (set) |
605 | if (set) |
594 | rstyle |= style; |
606 | rstyle |= style; |
595 | else if (style == ~RS_None) |
607 | else if (style == ~RS_None) |
596 | rstyle = DEFAULT_RSTYLE; |
608 | rstyle = DEFAULT_RSTYLE; |
597 | else |
609 | else |
598 | rstyle &= ~style; |
610 | rstyle &= ~style; |
599 | } |
611 | } |
600 | |
612 | |
601 | /* ------------------------------------------------------------------------- */ |
613 | /* ------------------------------------------------------------------------- */ |
602 | /* |
614 | /* |
603 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
615 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
604 | * count positive ==> scroll up |
616 | * count positive ==> scroll up |
605 | * count negative ==> scroll down |
617 | * count negative ==> scroll down |
606 | */ |
618 | */ |
607 | int |
619 | int |
608 | rxvt_term::scr_scroll_text (int row1, int row2, int count) |
620 | rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW |
609 | { |
621 | { |
610 | if (count == 0 || (row1 > row2)) |
622 | if (count == 0 || (row1 > row2)) |
611 | return 0; |
623 | return 0; |
612 | |
624 | |
613 | want_refresh = 1; |
625 | want_refresh = 1; |
614 | num_scr += count; |
626 | num_scr += count; |
615 | |
627 | |
616 | if (count > 0 |
628 | if (count > 0 |
617 | && row1 == 0 |
629 | && row1 == 0 |
618 | && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) |
630 | && (current_screen == PRIMARY || option (Opt_secondaryScroll))) |
619 | { |
631 | { |
620 | top_row = max (top_row - count, -saveLines); |
632 | top_row = max (top_row - count, -saveLines); |
621 | |
633 | |
622 | // scroll everything up 'count' lines |
634 | // scroll everything up 'count' lines |
623 | term_start = (term_start + count) % total_rows; |
635 | term_start = (term_start + count) % total_rows; |
624 | |
636 | |
|
|
637 | // sever bottommost line |
625 | { |
638 | { |
626 | // severe bottommost scrolled line |
|
|
627 | line_t &l = ROW(row2 - count); |
639 | line_t &l = ROW(row2 - count); |
|
|
640 | l.is_longer (0); |
628 | l.touch (); |
641 | l.touch (); |
629 | l.is_longer (0); |
|
|
630 | } |
642 | } |
631 | |
643 | |
632 | // erase newly scorlled-in lines |
644 | // erase newly scrolled-in lines |
633 | for (int i = count; i; --i ) |
645 | for (int i = count; i--; ) |
634 | { |
646 | { |
635 | // basically this is a slightly optimized scr_blank_screen_mem |
|
|
636 | // it is worth the effort on slower machines |
|
|
637 | line_t &l = ROW(nrow - i); |
647 | line_t &l = ROW(nrow - 1 - i); |
638 | |
648 | |
|
|
649 | // optimize if already cleared, can be significant on slow machines |
|
|
650 | // could be rolled into scr_blank_screen_mem |
|
|
651 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & (RS_fgMask | RS_bgMask))) |
|
|
652 | { |
639 | scr_blank_line (l, 0, l.l, rstyle); |
653 | scr_blank_line (l, 0, l.l, rstyle); |
640 | |
|
|
641 | l.l = 0; |
654 | l.l = 0; |
642 | l.f = 0; |
655 | l.f = 0; |
|
|
656 | } |
|
|
657 | else |
|
|
658 | scr_blank_screen_mem (l, rstyle); |
643 | } |
659 | } |
644 | |
660 | |
645 | // now copy lines below the scroll region bottom to the |
661 | // now copy lines below the scroll region bottom to the |
646 | // bottom of the screen again, so they look as if they |
662 | // bottom of the screen again, so they look as if they |
647 | // hadn't moved. |
663 | // hadn't moved. |
… | |
… | |
651 | line_t &l2 = ROW(i); |
667 | line_t &l2 = ROW(i); |
652 | |
668 | |
653 | ::swap (l1, l2); |
669 | ::swap (l1, l2); |
654 | l2.touch (); |
670 | l2.touch (); |
655 | } |
671 | } |
656 | |
672 | |
657 | // move and/or clear selection, if any |
673 | // move and/or clear selection, if any |
658 | if (selection.op && current_screen == selection.screen) |
674 | if (selection.op && current_screen == selection.screen) |
659 | { |
675 | { |
660 | selection.beg.row -= count; |
676 | selection.beg.row -= count; |
661 | selection.end.row -= count; |
677 | selection.end.row -= count; |
… | |
… | |
669 | selection.op = SELECTION_CLEAR; |
685 | selection.op = SELECTION_CLEAR; |
670 | } |
686 | } |
671 | } |
687 | } |
672 | |
688 | |
673 | // finally move the view window, if desired |
689 | // finally move the view window, if desired |
674 | if (OPTION (Opt_scrollWithBuffer) |
690 | if (option (Opt_scrollWithBuffer) |
675 | && view_start != 0 |
691 | && view_start != 0 |
676 | && view_start != -saveLines) |
692 | && view_start != -saveLines) |
677 | scr_page (UP, count); |
693 | scr_page (UP, count); |
678 | |
694 | |
679 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
695 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
… | |
… | |
697 | { |
713 | { |
698 | /* move selected region too */ |
714 | /* move selected region too */ |
699 | selection.beg.row -= count; |
715 | selection.beg.row -= count; |
700 | selection.end.row -= count; |
716 | selection.end.row -= count; |
701 | selection.mark.row -= count; |
717 | selection.mark.row -= count; |
702 | |
718 | |
703 | selection_check (0); |
719 | selection_check (0); |
704 | } |
720 | } |
705 | } |
721 | } |
706 | |
722 | |
707 | // use a simple and robust scrolling algorithm, this |
723 | // use a simple and robust scrolling algorithm, this |
… | |
… | |
731 | /* ------------------------------------------------------------------------- */ |
747 | /* ------------------------------------------------------------------------- */ |
732 | /* |
748 | /* |
733 | * Add text given in <str> of length <len> to screen struct |
749 | * Add text given in <str> of length <len> to screen struct |
734 | */ |
750 | */ |
735 | void |
751 | void |
736 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) |
752 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW |
737 | { |
753 | { |
738 | if (len <= 0) /* sanity */ |
754 | if (len <= 0) /* sanity */ |
739 | return; |
755 | return; |
740 | |
756 | |
741 | unsigned char checksel; |
757 | unsigned char checksel; |
… | |
… | |
747 | ZERO_SCROLLBACK (); |
763 | ZERO_SCROLLBACK (); |
748 | |
764 | |
749 | if (minlines > 0) |
765 | if (minlines > 0) |
750 | { |
766 | { |
751 | minlines += screen.cur.row - screen.bscroll; |
767 | minlines += screen.cur.row - screen.bscroll; |
|
|
768 | min_it (minlines, screen.cur.row - top_row); |
752 | |
769 | |
753 | if (minlines > 0 |
770 | if (minlines > 0 |
754 | && screen.tscroll == 0 |
771 | && screen.tscroll == 0 |
755 | && screen.bscroll == nrow - 1) |
772 | && screen.bscroll == nrow - 1) |
756 | { |
773 | { |
… | |
… | |
773 | |
790 | |
774 | while (str < strend) |
791 | while (str < strend) |
775 | { |
792 | { |
776 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
793 | c = (unicode_t)*str++; // convert to rxvt-unicodes representation |
777 | |
794 | |
778 | if (c < 0x20) |
795 | if (expect_false (c < 0x20)) |
779 | if (c == C0_LF) |
796 | if (c == C0_LF) |
780 | { |
797 | { |
781 | max_it (line->l, screen.cur.col); |
798 | max_it (line->l, screen.cur.col); |
782 | |
799 | |
783 | screen.flags &= ~Screen_WrapNext; |
800 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
802 | { |
819 | { |
803 | scr_tab (1, true); |
820 | scr_tab (1, true); |
804 | continue; |
821 | continue; |
805 | } |
822 | } |
806 | |
823 | |
|
|
824 | if (expect_false ( |
807 | if (checksel /* see if we're writing within selection */ |
825 | checksel /* see if we're writing within selection */ |
808 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
826 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
809 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
827 | && ROWCOL_IS_BEFORE (screen.cur, selection.end) |
|
|
828 | )) |
810 | { |
829 | { |
811 | checksel = 0; |
830 | checksel = 0; |
812 | /* |
831 | /* |
813 | * If we wrote anywhere in the selected area, kill the selection |
832 | * If we wrote anywhere in the selected area, kill the selection |
814 | * XXX: should we kill the mark too? Possibly, but maybe that |
833 | * XXX: should we kill the mark too? Possibly, but maybe that |
815 | * should be a similar check. |
834 | * should be a similar check. |
816 | */ |
835 | */ |
817 | CLEAR_SELECTION (); |
836 | CLEAR_SELECTION (); |
818 | } |
837 | } |
819 | |
838 | |
820 | if (screen.flags & Screen_WrapNext) |
839 | if (expect_false (screen.flags & Screen_WrapNext)) |
821 | { |
840 | { |
|
|
841 | scr_do_wrap (); |
|
|
842 | |
822 | max_it (line->l, ncol); |
843 | line->l = ncol; |
823 | line->is_longer (1); |
844 | line->is_longer (1); |
824 | |
845 | |
825 | scr_do_wrap (); |
|
|
826 | |
|
|
827 | row = screen.cur.row; |
846 | row = screen.cur.row; |
828 | line = &ROW(row); /* _must_ refresh */ |
847 | line = &ROW(row); /* _must_ refresh */ |
829 | } |
848 | } |
830 | |
849 | |
831 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
850 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
832 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
851 | if (expect_false (IN_RANGE_INC (c, 0xd800, 0xdfff))) |
833 | c = 0xfffd; |
852 | c = 0xfffd; |
834 | |
853 | |
835 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
854 | // rely on wcwidth to tell us the character width, do wcwidth before |
836 | // do wcwidth before further replacements, as wcwidth might return -1 |
855 | // further replacements, as wcwidth might return -1 for the line |
837 | // for the line drawing characters below as they might be invalid in the current |
856 | // drawing characters below as they might be invalid in the current |
838 | // locale. |
857 | // locale. |
839 | int width = c < 0x100 ? 1 : wcwidth (c); |
858 | int width = WCWIDTH (c); |
840 | |
859 | |
841 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
860 | if (expect_false (charsets [screen.charset] == '0')) // DEC SPECIAL |
842 | { |
861 | { |
843 | // vt100 special graphics and line drawing |
862 | // vt100 special graphics and line drawing |
844 | // 5f-7e standard vt100 |
863 | // 5f-7e standard vt100 |
845 | // 40-5e rxvt extension for extra curses acs chars |
864 | // 40-5e rxvt extension for extra curses acs chars |
846 | static uint16_t vt100_0[62] = { // 41 .. 7e |
865 | static uint16_t vt100_0[62] = { // 41 .. 7e |
… | |
… | |
859 | c = vt100_0[c - 0x41]; |
878 | c = vt100_0[c - 0x41]; |
860 | width = 1; // vt100 line drawing characters are always single-width |
879 | width = 1; // vt100 line drawing characters are always single-width |
861 | } |
880 | } |
862 | } |
881 | } |
863 | |
882 | |
864 | if (screen.flags & Screen_Insert) |
883 | if (expect_false (screen.flags & Screen_Insert)) |
865 | scr_insdel_chars (width, INSERT); |
884 | scr_insdel_chars (width, INSERT); |
866 | |
885 | |
867 | if (width != 0) |
886 | if (width != 0) |
868 | { |
887 | { |
869 | #if !UNICODE_3 |
888 | #if !UNICODE_3 |
… | |
… | |
875 | c = 0xfffd; |
894 | c = 0xfffd; |
876 | # endif |
895 | # endif |
877 | #endif |
896 | #endif |
878 | |
897 | |
879 | // nuke the character at this position, if required |
898 | // nuke the character at this position, if required |
|
|
899 | if (expect_false ( |
880 | if (line->t[screen.cur.col] == NOCHAR |
900 | line->t[screen.cur.col] == NOCHAR |
881 | || (screen.cur.col < ncol - 1 |
901 | || (screen.cur.col < ncol - 1 |
882 | && line->t[screen.cur.col + 1] == NOCHAR)) |
902 | && line->t[screen.cur.col + 1] == NOCHAR) |
883 | { |
903 | )) |
884 | int col = screen.cur.col; |
904 | scr_kill_char (*line, screen.cur.col); |
885 | |
|
|
886 | // find begin |
|
|
887 | while (col > 0 && line->t[col] == NOCHAR) |
|
|
888 | col--; |
|
|
889 | |
|
|
890 | rend_t rend = SET_FONT (line->r[col], FONTSET (line->r[col])->find_font (' ')); |
|
|
891 | |
|
|
892 | // found begin, nuke |
|
|
893 | do { |
|
|
894 | line->t[col] = ' '; |
|
|
895 | line->r[col] = rend; |
|
|
896 | col++; |
|
|
897 | } while (col < ncol && line->t[col] == NOCHAR); |
|
|
898 | } |
|
|
899 | |
905 | |
900 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
906 | rend_t rend = SET_FONT (rstyle, FONTSET (rstyle)->find_font (c)); |
901 | |
907 | |
902 | // if the character doesn't fit into the remaining columns... |
908 | // if the character doesn't fit into the remaining columns... |
903 | if (screen.cur.col > ncol - width && ncol >= width) |
909 | if (expect_false (screen.cur.col > ncol - width && ncol >= width)) |
904 | { |
910 | { |
905 | // ...output spaces |
911 | // ...output spaces |
906 | c = ' '; |
912 | c = ' '; |
907 | // and try the same character next loop iteration |
913 | // and try the same character next loop iteration |
908 | --str; |
914 | --str; |
… | |
… | |
913 | do |
919 | do |
914 | { |
920 | { |
915 | line->t[screen.cur.col] = c; |
921 | line->t[screen.cur.col] = c; |
916 | line->r[screen.cur.col] = rend; |
922 | line->r[screen.cur.col] = rend; |
917 | |
923 | |
918 | if (screen.cur.col < ncol - 1) |
924 | if (expect_true (screen.cur.col < ncol - 1)) |
919 | screen.cur.col++; |
925 | screen.cur.col++; |
920 | else |
926 | else |
921 | { |
927 | { |
922 | line->l = ncol; |
928 | line->l = ncol; |
923 | if (screen.flags & Screen_Autowrap) |
929 | if (screen.flags & Screen_Autowrap) |
… | |
… | |
925 | break; |
931 | break; |
926 | } |
932 | } |
927 | |
933 | |
928 | c = NOCHAR; |
934 | c = NOCHAR; |
929 | } |
935 | } |
930 | while (--width > 0); |
936 | while (expect_false (--width > 0)); |
931 | |
937 | |
932 | // pad with spaces when overwriting wide character with smaller one |
938 | // pad with spaces when overwriting wide character with smaller one |
933 | if (!width) |
939 | if (expect_false (!width)) |
934 | { |
940 | { |
935 | line->touch (); |
941 | line->touch (); |
936 | |
942 | |
937 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
943 | for (int c = screen.cur.col; c < ncol && line->t[c] == NOCHAR; c++) |
938 | { |
944 | { |
939 | line->t[c] = ' '; |
945 | line->t[c] = ' '; |
940 | line->r[c] = rend; |
946 | line->r[c] = rend; |
941 | } |
947 | } |
942 | } |
948 | } |
943 | } |
949 | } |
|
|
950 | #if ENABLE_COMBINING |
944 | else // width == 0 |
951 | else // width == 0 |
945 | { |
952 | { |
946 | #if ENABLE_COMBINING |
953 | if (c != 0xfeff) // ignore BOM |
947 | // handle combining characters |
|
|
948 | // we just tag the accent on the previous on-screen character. |
|
|
949 | // this is arguably not correct, but also arguably not wrong. |
|
|
950 | // we don't handle double-width characters nicely yet. |
|
|
951 | line_t *linep; |
|
|
952 | text_t *tp; |
|
|
953 | rend_t *rp; |
|
|
954 | |
|
|
955 | if (screen.cur.col > 0) |
|
|
956 | { |
954 | { |
|
|
955 | // handle combining characters |
|
|
956 | // we just tag the accent on the previous on-screen character. |
|
|
957 | // this is arguably not correct, but also arguably not wrong. |
|
|
958 | // we don't handle double-width characters nicely yet. |
|
|
959 | line_t *linep; |
|
|
960 | text_t *tp; |
|
|
961 | rend_t *rp; |
|
|
962 | |
|
|
963 | if (screen.cur.col > 0) |
|
|
964 | { |
957 | linep = line; |
965 | linep = line; |
958 | tp = line->t + screen.cur.col - 1; |
966 | tp = line->t + screen.cur.col - 1; |
959 | rp = line->r + screen.cur.col - 1; |
967 | rp = line->r + screen.cur.col - 1; |
|
|
968 | } |
|
|
969 | else if (screen.cur.row > 0 |
|
|
970 | && ROW(screen.cur.row - 1).is_longer ()) |
|
|
971 | { |
|
|
972 | linep = &ROW(screen.cur.row - 1); |
|
|
973 | tp = line->t + ncol - 1; |
|
|
974 | rp = line->r + ncol - 1; |
|
|
975 | } |
|
|
976 | else |
|
|
977 | continue; |
|
|
978 | |
|
|
979 | linep->touch (); |
|
|
980 | |
|
|
981 | while (*tp == NOCHAR && tp > linep->t) |
|
|
982 | tp--, rp--; |
|
|
983 | |
|
|
984 | // first try to find a precomposed character |
|
|
985 | unicode_t n = rxvt_compose (*tp, c); |
|
|
986 | if (n == NOCHAR) |
|
|
987 | n = rxvt_composite.compose (*tp, c); |
|
|
988 | |
|
|
989 | *tp = n; |
|
|
990 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
960 | } |
991 | } |
961 | else if (screen.cur.row > 0 |
|
|
962 | && ROW(screen.cur.row - 1).is_longer ()) |
|
|
963 | { |
|
|
964 | linep = &ROW(screen.cur.row - 1); |
|
|
965 | tp = line->t + ncol - 1; |
|
|
966 | rp = line->r + ncol - 1; |
|
|
967 | } |
992 | } |
968 | else |
|
|
969 | continue; |
|
|
970 | |
|
|
971 | linep->touch (); |
|
|
972 | |
|
|
973 | while (*tp == NOCHAR && tp > linep->t) |
|
|
974 | tp--, rp--; |
|
|
975 | |
|
|
976 | // first try to find a precomposed character |
|
|
977 | unicode_t n = rxvt_compose (*tp, c); |
|
|
978 | if (n == NOCHAR) |
|
|
979 | n = rxvt_composite.compose (*tp, c); |
|
|
980 | |
|
|
981 | *tp = n; |
|
|
982 | *rp = SET_FONT (*rp, FONTSET (*rp)->find_font (*tp)); |
|
|
983 | #endif |
993 | #endif |
984 | } |
|
|
985 | } |
994 | } |
986 | |
995 | |
987 | max_it (line->l, screen.cur.col); |
996 | max_it (line->l, screen.cur.col); |
988 | |
997 | |
989 | #ifdef DEBUG_STRICT |
998 | #ifdef DEBUG_STRICT |
… | |
… | |
995 | /* |
1004 | /* |
996 | * Process Backspace. Move back the cursor back a position, wrap if have to |
1005 | * Process Backspace. Move back the cursor back a position, wrap if have to |
997 | * XTERM_SEQ: CTRL-H |
1006 | * XTERM_SEQ: CTRL-H |
998 | */ |
1007 | */ |
999 | void |
1008 | void |
1000 | rxvt_term::scr_backspace () |
1009 | rxvt_term::scr_backspace () NOTHROW |
1001 | { |
1010 | { |
1002 | want_refresh = 1; |
|
|
1003 | |
|
|
1004 | if (screen.cur.col == 0) |
1011 | if (screen.cur.col == 0) |
1005 | { |
1012 | { |
1006 | if (screen.cur.row > 0) |
1013 | if (screen.cur.row > 0) |
1007 | { |
1014 | { |
1008 | #ifdef TERMCAP_HAS_BW |
1015 | #ifdef TERMCAP_HAS_BW |
1009 | screen.cur.col = ncol - 1; |
1016 | screen.cur.col = ncol - 1; |
1010 | screen.cur.row--; |
1017 | --screen.cur.row; |
1011 | return; |
1018 | |
|
|
1019 | want_refresh = 1; |
1012 | #endif |
1020 | #endif |
1013 | } |
1021 | } |
1014 | } |
1022 | } |
1015 | else if (!(screen.flags & Screen_WrapNext)) |
1023 | else |
1016 | scr_gotorc (0, -1, RELATIVE); |
1024 | scr_gotorc (0, -1, RELATIVE); |
1017 | |
|
|
1018 | screen.flags &= ~Screen_WrapNext; |
|
|
1019 | } |
1025 | } |
1020 | |
1026 | |
1021 | /* ------------------------------------------------------------------------- */ |
1027 | /* ------------------------------------------------------------------------- */ |
1022 | /* |
1028 | /* |
1023 | * Process Horizontal Tab |
1029 | * Process Horizontal Tab |
1024 | * count: +ve = forward; -ve = backwards |
1030 | * count: +ve = forward; -ve = backwards |
1025 | * XTERM_SEQ: CTRL-I |
1031 | * XTERM_SEQ: CTRL-I |
1026 | */ |
1032 | */ |
1027 | void |
1033 | void |
1028 | rxvt_term::scr_tab (int count, bool ht) |
1034 | rxvt_term::scr_tab (int count, bool ht) NOTHROW |
1029 | { |
1035 | { |
1030 | int i, x; |
1036 | int i, x; |
1031 | |
1037 | |
1032 | want_refresh = 1; |
1038 | want_refresh = 1; |
1033 | i = x = screen.cur.col; |
1039 | i = x = screen.cur.col; |
… | |
… | |
1046 | x = i; |
1052 | x = i; |
1047 | |
1053 | |
1048 | if (!--count) |
1054 | if (!--count) |
1049 | break; |
1055 | break; |
1050 | } |
1056 | } |
1051 | else |
1057 | else |
1052 | ht &= l.t[i] == ' ' |
1058 | ht &= l.t[i] == ' ' |
1053 | && RS_SAME (l.r[i], base_rend); |
1059 | && RS_SAME (l.r[i], base_rend); |
1054 | |
1060 | |
1055 | if (count) |
1061 | if (count) |
1056 | x = ncol - 1; |
1062 | x = ncol - 1; |
1057 | |
1063 | |
1058 | // store horizontal tab commands as characters inside the text |
1064 | // store horizontal tab commands as characters inside the text |
1059 | // buffer so they can be selected and pasted. |
1065 | // buffer so they can be selected and pasted. |
1060 | if (ht && OPTION (Opt_pastableTabs)) |
1066 | if (ht && option (Opt_pastableTabs)) |
1061 | { |
1067 | { |
1062 | base_rend = SET_FONT (base_rend, 0); |
1068 | base_rend = SET_FONT (base_rend, 0); |
1063 | |
1069 | |
1064 | l.touch (x); |
1070 | l.touch (x); |
1065 | |
1071 | |
… | |
… | |
1098 | * Process DEC Back Index |
1104 | * Process DEC Back Index |
1099 | * XTERM_SEQ: ESC 6 |
1105 | * XTERM_SEQ: ESC 6 |
1100 | * Move cursor left in row. If we're at the left boundary, shift everything |
1106 | * Move cursor left in row. If we're at the left boundary, shift everything |
1101 | * in that row right. Clear left column. |
1107 | * in that row right. Clear left column. |
1102 | */ |
1108 | */ |
1103 | #if ENABLE_FRILLS |
1109 | #if !ENABLE_MINIMAL |
1104 | void |
1110 | void |
1105 | rxvt_term::scr_backindex () |
1111 | rxvt_term::scr_backindex () NOTHROW |
1106 | { |
1112 | { |
1107 | if (screen.cur.col > 0) |
1113 | if (screen.cur.col > 0) |
1108 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1114 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1109 | else |
1115 | else |
1110 | scr_insdel_chars (1, INSERT); |
1116 | scr_insdel_chars (1, INSERT); |
… | |
… | |
1115 | * Process DEC Forward Index |
1121 | * Process DEC Forward Index |
1116 | * XTERM_SEQ: ESC 9 |
1122 | * XTERM_SEQ: ESC 9 |
1117 | * Move cursor right in row. If we're at the right boundary, shift everything |
1123 | * Move cursor right in row. If we're at the right boundary, shift everything |
1118 | * in that row left. Clear right column. |
1124 | * in that row left. Clear right column. |
1119 | */ |
1125 | */ |
1120 | #if ENABLE_FRILLS |
1126 | #if !ENABLE_MINIMAL |
1121 | void |
1127 | void |
1122 | rxvt_term::scr_forwardindex () |
1128 | rxvt_term::scr_forwardindex () NOTHROW |
1123 | { |
1129 | { |
1124 | if (screen.cur.col < ncol - 1) |
1130 | if (screen.cur.col < ncol - 1) |
1125 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1131 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1126 | else |
1132 | else |
1127 | { |
1133 | { |
… | |
… | |
1140 | /* ------------------------------------------------------------------------- */ |
1146 | /* ------------------------------------------------------------------------- */ |
1141 | /* |
1147 | /* |
1142 | * Goto Row/Column |
1148 | * Goto Row/Column |
1143 | */ |
1149 | */ |
1144 | void |
1150 | void |
1145 | rxvt_term::scr_gotorc (int row, int col, int relative) |
1151 | rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW |
1146 | { |
1152 | { |
1147 | want_refresh = 1; |
1153 | want_refresh = 1; |
1148 | ZERO_SCROLLBACK (); |
1154 | ZERO_SCROLLBACK (); |
1149 | |
1155 | |
1150 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1156 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
… | |
… | |
1172 | } |
1178 | } |
1173 | } |
1179 | } |
1174 | else |
1180 | else |
1175 | { |
1181 | { |
1176 | if (screen.flags & Screen_Relative) |
1182 | if (screen.flags & Screen_Relative) |
|
|
1183 | { |
1177 | { /* relative origin mode */ |
1184 | /* relative origin mode */ |
1178 | screen.cur.row = row + screen.tscroll; |
1185 | screen.cur.row = row + screen.tscroll; |
1179 | min_it (screen.cur.row, screen.bscroll); |
1186 | min_it (screen.cur.row, screen.bscroll); |
1180 | } |
1187 | } |
1181 | else |
1188 | else |
1182 | screen.cur.row = row; |
1189 | screen.cur.row = row; |
… | |
… | |
1188 | /* ------------------------------------------------------------------------- */ |
1195 | /* ------------------------------------------------------------------------- */ |
1189 | /* |
1196 | /* |
1190 | * direction should be UP or DN |
1197 | * direction should be UP or DN |
1191 | */ |
1198 | */ |
1192 | void |
1199 | void |
1193 | rxvt_term::scr_index (enum page_dirn direction) |
1200 | rxvt_term::scr_index (enum page_dirn direction) NOTHROW |
1194 | { |
1201 | { |
1195 | int dirn; |
1202 | int dirn; |
1196 | |
1203 | |
1197 | want_refresh = 1; |
1204 | want_refresh = 1; |
1198 | ZERO_SCROLLBACK (); |
1205 | ZERO_SCROLLBACK (); |
… | |
… | |
1215 | /* |
1222 | /* |
1216 | * Erase part or whole of a line |
1223 | * Erase part or whole of a line |
1217 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1224 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1218 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1225 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1219 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1226 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
|
|
1227 | * extension: clear to right unless wrapped: ESC [ 3 K |
1220 | */ |
1228 | */ |
1221 | void |
1229 | void |
1222 | rxvt_term::scr_erase_line (int mode) |
1230 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1223 | { |
1231 | { |
1224 | unsigned int col, num; |
1232 | unsigned int col, num; |
1225 | |
1233 | |
1226 | want_refresh = 1; |
1234 | want_refresh = 1; |
1227 | ZERO_SCROLLBACK (); |
1235 | ZERO_SCROLLBACK (); |
… | |
… | |
1233 | line.touch (); |
1241 | line.touch (); |
1234 | line.is_longer (0); |
1242 | line.is_longer (0); |
1235 | |
1243 | |
1236 | switch (mode) |
1244 | switch (mode) |
1237 | { |
1245 | { |
|
|
1246 | case 3: |
|
|
1247 | if (screen.flags & Screen_WrapNext) |
|
|
1248 | return; |
|
|
1249 | |
|
|
1250 | /* fall through */ |
|
|
1251 | |
1238 | case 0: /* erase to end of line */ |
1252 | case 0: /* erase to end of line */ |
1239 | col = screen.cur.col; |
1253 | col = screen.cur.col; |
1240 | num = ncol - col; |
1254 | num = ncol - col; |
1241 | min_it (line.l, col); |
1255 | min_it (line.l, col); |
|
|
1256 | |
1242 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1257 | if (ROWCOL_IN_ROW_AT_OR_AFTER (selection.beg, screen.cur) |
1243 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1258 | || ROWCOL_IN_ROW_AT_OR_AFTER (selection.end, screen.cur)) |
1244 | CLEAR_SELECTION (); |
1259 | CLEAR_SELECTION (); |
1245 | break; |
1260 | break; |
|
|
1261 | |
1246 | case 1: /* erase to beginning of line */ |
1262 | case 1: /* erase to beginning of line */ |
1247 | col = 0; |
1263 | col = 0; |
1248 | num = screen.cur.col + 1; |
1264 | num = screen.cur.col + 1; |
|
|
1265 | |
1249 | if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) |
1266 | if (ROWCOL_IN_ROW_AT_OR_BEFORE (selection.beg, screen.cur) |
1250 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1267 | || ROWCOL_IN_ROW_AT_OR_BEFORE (selection.end, screen.cur)) |
1251 | CLEAR_SELECTION (); |
1268 | CLEAR_SELECTION (); |
1252 | break; |
1269 | break; |
|
|
1270 | |
1253 | case 2: /* erase whole line */ |
1271 | case 2: /* erase whole line */ |
1254 | col = 0; |
1272 | col = 0; |
1255 | num = ncol; |
1273 | num = ncol; |
1256 | line.l = 0; |
1274 | line.l = 0; |
1257 | if (selection.beg.row <= screen.cur.row |
1275 | if (selection.beg.row <= screen.cur.row |
… | |
… | |
1271 | * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J |
1289 | * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J |
1272 | * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J |
1290 | * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J |
1273 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1291 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1274 | */ |
1292 | */ |
1275 | void |
1293 | void |
1276 | rxvt_term::scr_erase_screen (int mode) |
1294 | rxvt_term::scr_erase_screen (int mode) NOTHROW |
1277 | { |
1295 | { |
1278 | int num; |
1296 | int num; |
1279 | int32_t row; |
1297 | int32_t row; |
1280 | rend_t ren; |
1298 | rend_t ren; |
1281 | XGCValues gcvalue; |
1299 | XGCValues gcvalue; |
… | |
… | |
1315 | if (row >= nrow) /* Out Of Bounds */ |
1333 | if (row >= nrow) /* Out Of Bounds */ |
1316 | return; |
1334 | return; |
1317 | |
1335 | |
1318 | min_it (num, nrow - row); |
1336 | min_it (num, nrow - row); |
1319 | |
1337 | |
|
|
1338 | /*TODO: the xlceararea/xfillrectangle below don't take scroll offste into account, ask mikachu for details */ |
1320 | if (rstyle & (RS_RVid | RS_Uline)) |
1339 | if (rstyle & (RS_RVid | RS_Uline)) |
1321 | ren = (rend_t) ~RS_None; |
1340 | ren = (rend_t) ~RS_None; |
1322 | else if (GET_BASEBG (rstyle) == Color_bg) |
1341 | else if (GET_BASEBG (rstyle) == Color_bg) |
1323 | { |
1342 | { |
1324 | ren = DEFAULT_RSTYLE; |
1343 | ren = DEFAULT_RSTYLE; |
1325 | CLEAR_ROWS (row, num); |
1344 | |
|
|
1345 | if (mapped) |
|
|
1346 | XClearArea (dpy, vt, 0, |
|
|
1347 | Row2Pixel (row), (unsigned int)width, |
|
|
1348 | (unsigned int)Height2Pixel (num), False); |
1326 | } |
1349 | } |
1327 | else |
1350 | else |
1328 | { |
1351 | { |
1329 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1352 | ren = rstyle & (RS_fgMask | RS_bgMask); |
|
|
1353 | |
1330 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1354 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1331 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1355 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1332 | ERASE_ROWS (row, num); |
1356 | XFillRectangle (dpy, vt, gc, |
|
|
1357 | 0, Row2Pixel (row), |
|
|
1358 | (unsigned int)width, |
|
|
1359 | (unsigned int)Height2Pixel (num)); |
1333 | gcvalue.foreground = pix_colors[Color_fg]; |
1360 | gcvalue.foreground = pix_colors[Color_fg]; |
1334 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1361 | XChangeGC (dpy, gc, GCForeground, &gcvalue); |
1335 | } |
1362 | } |
1336 | |
1363 | |
1337 | for (; num--; row++) |
1364 | for (; num--; row++) |
1338 | { |
1365 | { |
1339 | scr_blank_screen_mem (ROW(row), rstyle); |
1366 | scr_blank_screen_mem (ROW(row), rstyle); |
1340 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1367 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1341 | } |
1368 | } |
1342 | } |
1369 | } |
1343 | |
1370 | |
1344 | #if ENABLE_FRILLS |
1371 | #if !ENABLE_MINIMAL |
1345 | void |
1372 | void |
1346 | rxvt_term::scr_erase_savelines () |
1373 | rxvt_term::scr_erase_savelines () NOTHROW |
1347 | { |
1374 | { |
1348 | want_refresh = 1; |
1375 | want_refresh = 1; |
1349 | ZERO_SCROLLBACK (); |
1376 | ZERO_SCROLLBACK (); |
1350 | |
1377 | |
1351 | top_row = 0; |
1378 | top_row = 0; |
… | |
… | |
1356 | /* |
1383 | /* |
1357 | * Fill the screen with `E's |
1384 | * Fill the screen with `E's |
1358 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1385 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1359 | */ |
1386 | */ |
1360 | void |
1387 | void |
1361 | rxvt_term::scr_E () |
1388 | rxvt_term::scr_E () NOTHROW |
1362 | { |
1389 | { |
1363 | rend_t fs; |
1390 | rend_t fs; |
1364 | |
1391 | |
1365 | want_refresh = 1; |
1392 | want_refresh = 1; |
1366 | ZERO_SCROLLBACK (); |
1393 | ZERO_SCROLLBACK (); |
… | |
… | |
1387 | /* ------------------------------------------------------------------------- */ |
1414 | /* ------------------------------------------------------------------------- */ |
1388 | /* |
1415 | /* |
1389 | * Insert/Delete <count> lines |
1416 | * Insert/Delete <count> lines |
1390 | */ |
1417 | */ |
1391 | void |
1418 | void |
1392 | rxvt_term::scr_insdel_lines (int count, int insdel) |
1419 | rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW |
1393 | { |
1420 | { |
1394 | int end; |
1421 | int end; |
1395 | |
1422 | |
1396 | ZERO_SCROLLBACK (); |
1423 | ZERO_SCROLLBACK (); |
1397 | |
1424 | |
… | |
… | |
1417 | /* ------------------------------------------------------------------------- */ |
1444 | /* ------------------------------------------------------------------------- */ |
1418 | /* |
1445 | /* |
1419 | * Insert/Delete <count> characters from the current position |
1446 | * Insert/Delete <count> characters from the current position |
1420 | */ |
1447 | */ |
1421 | void |
1448 | void |
1422 | rxvt_term::scr_insdel_chars (int count, int insdel) |
1449 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1423 | { |
1450 | { |
1424 | int col, row; |
1451 | int col, row; |
1425 | rend_t tr; |
1452 | rend_t tr; |
1426 | |
1453 | |
1427 | want_refresh = 1; |
1454 | want_refresh = 1; |
… | |
… | |
1458 | { |
1485 | { |
1459 | if (selection.end.row != screen.cur.row |
1486 | if (selection.end.row != screen.cur.row |
1460 | || (selection.end.col + count >= ncol)) |
1487 | || (selection.end.col + count >= ncol)) |
1461 | CLEAR_SELECTION (); |
1488 | CLEAR_SELECTION (); |
1462 | else |
1489 | else |
|
|
1490 | { |
1463 | { /* shift selection */ |
1491 | /* shift selection */ |
1464 | selection.beg.col += count; |
1492 | selection.beg.col += count; |
1465 | selection.mark.col += count; /* XXX: yes? */ |
1493 | selection.mark.col += count; /* XXX: yes? */ |
1466 | selection.end.col += count; |
1494 | selection.end.col += count; |
1467 | } |
1495 | } |
1468 | } |
1496 | } |
… | |
… | |
1473 | case ERASE: |
1501 | case ERASE: |
1474 | screen.cur.col += count; /* don't worry if > ncol */ |
1502 | screen.cur.col += count; /* don't worry if > ncol */ |
1475 | selection_check (1); |
1503 | selection_check (1); |
1476 | screen.cur.col -= count; |
1504 | screen.cur.col -= count; |
1477 | |
1505 | |
1478 | line->l = max (line->l - count, 0); |
|
|
1479 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1506 | scr_blank_line (*line, screen.cur.col, count, rstyle); |
1480 | break; |
1507 | break; |
1481 | |
1508 | |
1482 | case DELETE: |
1509 | case DELETE: |
1483 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
1510 | tr = line->r[ncol - 1] & (RS_fgMask | RS_bgMask | RS_baseattrMask); |
… | |
… | |
1515 | /* |
1542 | /* |
1516 | * Set the scrolling region |
1543 | * Set the scrolling region |
1517 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1544 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1518 | */ |
1545 | */ |
1519 | void |
1546 | void |
1520 | rxvt_term::scr_scroll_region (int top, int bot) |
1547 | rxvt_term::scr_scroll_region (int top, int bot) NOTHROW |
1521 | { |
1548 | { |
1522 | max_it (top, 0); |
1549 | max_it (top, 0); |
1523 | min_it (bot, nrow - 1); |
1550 | min_it (bot, nrow - 1); |
1524 | |
1551 | |
1525 | if (top > bot) |
1552 | if (top > bot) |
… | |
… | |
1535 | * Make the cursor visible/invisible |
1562 | * Make the cursor visible/invisible |
1536 | * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h |
1563 | * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h |
1537 | * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l |
1564 | * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l |
1538 | */ |
1565 | */ |
1539 | void |
1566 | void |
1540 | rxvt_term::scr_cursor_visible (int mode) |
1567 | rxvt_term::scr_cursor_visible (int mode) NOTHROW |
1541 | { |
1568 | { |
1542 | want_refresh = 1; |
1569 | want_refresh = 1; |
1543 | |
1570 | |
1544 | if (mode) |
1571 | if (mode) |
1545 | screen.flags |= Screen_VisibleCursor; |
1572 | screen.flags |= Screen_VisibleCursor; |
… | |
… | |
1552 | * Set/unset automatic wrapping |
1579 | * Set/unset automatic wrapping |
1553 | * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h |
1580 | * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h |
1554 | * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l |
1581 | * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l |
1555 | */ |
1582 | */ |
1556 | void |
1583 | void |
1557 | rxvt_term::scr_autowrap (int mode) |
1584 | rxvt_term::scr_autowrap (int mode) NOTHROW |
1558 | { |
1585 | { |
1559 | if (mode) |
1586 | if (mode) |
1560 | screen.flags |= Screen_Autowrap; |
1587 | screen.flags |= Screen_Autowrap; |
1561 | else |
1588 | else |
1562 | screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); |
1589 | screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); |
… | |
… | |
1571 | * and the cursor cannot be moved outside. |
1598 | * and the cursor cannot be moved outside. |
1572 | * XTERM_SEQ: Set Absolute: ESC [ ? 6 h |
1599 | * XTERM_SEQ: Set Absolute: ESC [ ? 6 h |
1573 | * XTERM_SEQ: Set Relative: ESC [ ? 6 l |
1600 | * XTERM_SEQ: Set Relative: ESC [ ? 6 l |
1574 | */ |
1601 | */ |
1575 | void |
1602 | void |
1576 | rxvt_term::scr_relative_origin (int mode) |
1603 | rxvt_term::scr_relative_origin (int mode) NOTHROW |
1577 | { |
1604 | { |
1578 | if (mode) |
1605 | if (mode) |
1579 | screen.flags |= Screen_Relative; |
1606 | screen.flags |= Screen_Relative; |
1580 | else |
1607 | else |
1581 | screen.flags &= ~Screen_Relative; |
1608 | screen.flags &= ~Screen_Relative; |
… | |
… | |
1588 | * Set insert/replace mode |
1615 | * Set insert/replace mode |
1589 | * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h |
1616 | * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h |
1590 | * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l |
1617 | * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l |
1591 | */ |
1618 | */ |
1592 | void |
1619 | void |
1593 | rxvt_term::scr_insert_mode (int mode) |
1620 | rxvt_term::scr_insert_mode (int mode) NOTHROW |
1594 | { |
1621 | { |
1595 | if (mode) |
1622 | if (mode) |
1596 | screen.flags |= Screen_Insert; |
1623 | screen.flags |= Screen_Insert; |
1597 | else |
1624 | else |
1598 | screen.flags &= ~Screen_Insert; |
1625 | screen.flags &= ~Screen_Insert; |
… | |
… | |
1604 | * XTERM_SEQ: Set tab at current column : ESC H |
1631 | * XTERM_SEQ: Set tab at current column : ESC H |
1605 | * XTERM_SEQ: Clear tab at current column: ESC [ 0 g |
1632 | * XTERM_SEQ: Clear tab at current column: ESC [ 0 g |
1606 | * XTERM_SEQ: Clear all tabs : ESC [ 3 g |
1633 | * XTERM_SEQ: Clear all tabs : ESC [ 3 g |
1607 | */ |
1634 | */ |
1608 | void |
1635 | void |
1609 | rxvt_term::scr_set_tab (int mode) |
1636 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1610 | { |
1637 | { |
1611 | if (mode < 0) |
1638 | if (mode < 0) |
1612 | memset (tabs, 0, ncol * sizeof (char)); |
1639 | memset (tabs, 0, ncol); |
1613 | else if (screen.cur.col < ncol) |
1640 | else if (screen.cur.col < ncol) |
1614 | tabs [screen.cur.col] = !!mode; |
1641 | tabs [screen.cur.col] = !!mode; |
1615 | } |
1642 | } |
1616 | |
1643 | |
1617 | /* ------------------------------------------------------------------------- */ |
1644 | /* ------------------------------------------------------------------------- */ |
… | |
… | |
1619 | * Set reverse/normal video |
1646 | * Set reverse/normal video |
1620 | * XTERM_SEQ: Reverse video: ESC [ ? 5 h |
1647 | * XTERM_SEQ: Reverse video: ESC [ ? 5 h |
1621 | * XTERM_SEQ: Normal video : ESC [ ? 5 l |
1648 | * XTERM_SEQ: Normal video : ESC [ ? 5 l |
1622 | */ |
1649 | */ |
1623 | void |
1650 | void |
1624 | rxvt_term::scr_rvideo_mode (int mode) |
1651 | rxvt_term::scr_rvideo_mode (bool on) NOTHROW |
1625 | { |
1652 | { |
1626 | XGCValues gcvalue; |
1653 | rvideo_mode = on; |
1627 | |
1654 | |
|
|
1655 | #ifndef NO_BELL |
|
|
1656 | on ^= rvideo_bell; |
|
|
1657 | #endif |
|
|
1658 | |
1628 | if (rvideo != mode) |
1659 | if (rvideo_state != on) |
1629 | { |
1660 | { |
1630 | rvideo = mode; |
1661 | rvideo_state = on; |
|
|
1662 | |
1631 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1663 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1632 | #if XPM_BACKGROUND |
1664 | #ifdef HAVE_BG_PIXMAP |
1633 | if (bgPixmap.pixmap == None) |
1665 | if (bgPixmap.pixmap == None) |
1634 | #endif |
1666 | #endif |
1635 | #if TRANSPARENT |
1667 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
1636 | if (! OPTION (Opt_transparent) || am_transparent == 0) |
|
|
1637 | #endif |
|
|
1638 | XSetWindowBackground (display->display, vt, |
|
|
1639 | pix_colors[Color_bg]); |
|
|
1640 | |
1668 | |
|
|
1669 | XGCValues gcvalue; |
1641 | gcvalue.foreground = pix_colors[Color_fg]; |
1670 | gcvalue.foreground = pix_colors[Color_fg]; |
1642 | gcvalue.background = pix_colors[Color_bg]; |
1671 | gcvalue.background = pix_colors[Color_bg]; |
1643 | XChangeGC (display->display, gc, GCBackground | GCForeground, |
1672 | XChangeGC (dpy, gc, GCBackground | GCForeground, &gcvalue); |
1644 | &gcvalue); |
1673 | |
1645 | scr_clear (); |
1674 | scr_clear (); |
1646 | scr_touch (true); |
1675 | scr_touch (true); |
1647 | } |
1676 | } |
1648 | } |
1677 | } |
1649 | |
1678 | |
… | |
… | |
1651 | /* |
1680 | /* |
1652 | * Report current cursor position |
1681 | * Report current cursor position |
1653 | * XTERM_SEQ: Report position: ESC [ 6 n |
1682 | * XTERM_SEQ: Report position: ESC [ 6 n |
1654 | */ |
1683 | */ |
1655 | void |
1684 | void |
1656 | rxvt_term::scr_report_position () |
1685 | rxvt_term::scr_report_position () NOTHROW |
1657 | { |
1686 | { |
1658 | tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); |
1687 | tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); |
1659 | } |
1688 | } |
1660 | |
1689 | |
1661 | /* ------------------------------------------------------------------------- * |
1690 | /* ------------------------------------------------------------------------- * |
… | |
… | |
1664 | |
1693 | |
1665 | /* |
1694 | /* |
1666 | * Set font style |
1695 | * Set font style |
1667 | */ |
1696 | */ |
1668 | void |
1697 | void |
1669 | rxvt_term::set_font_style () |
1698 | rxvt_term::set_font_style () NOTHROW |
1670 | { |
1699 | { |
1671 | #if 0 |
1700 | #if 0 |
1672 | switch (charsets [screen.charset]) |
1701 | switch (charsets [screen.charset]) |
1673 | { |
1702 | { |
1674 | case '0': /* DEC Special Character & Line Drawing Set */ |
1703 | case '0': /* DEC Special Character & Line Drawing Set */ |
… | |
… | |
1696 | * XTERM_SEQ: Invoke G1 character set: CTRL-N |
1725 | * XTERM_SEQ: Invoke G1 character set: CTRL-N |
1697 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1726 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1698 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1727 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1699 | */ |
1728 | */ |
1700 | void |
1729 | void |
1701 | rxvt_term::scr_charset_choose (int set) |
1730 | rxvt_term::scr_charset_choose (int set) NOTHROW |
1702 | { |
1731 | { |
1703 | screen.charset = set; |
1732 | screen.charset = set; |
1704 | set_font_style (); |
1733 | set_font_style (); |
1705 | } |
1734 | } |
1706 | |
1735 | |
… | |
… | |
1712 | * XTERM_SEQ: Set G2 character set: ESC * <C> |
1741 | * XTERM_SEQ: Set G2 character set: ESC * <C> |
1713 | * XTERM_SEQ: Set G3 character set: ESC + <C> |
1742 | * XTERM_SEQ: Set G3 character set: ESC + <C> |
1714 | * See set_font_style for possible values for <C> |
1743 | * See set_font_style for possible values for <C> |
1715 | */ |
1744 | */ |
1716 | void |
1745 | void |
1717 | rxvt_term::scr_charset_set (int set, unsigned int ch) |
1746 | rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW |
1718 | { |
1747 | { |
1719 | charsets[set] = (unsigned char)ch; |
1748 | charsets[set] = (unsigned char)ch; |
1720 | set_font_style (); |
1749 | set_font_style (); |
1721 | } |
1750 | } |
1722 | |
1751 | |
… | |
… | |
1727 | |
1756 | |
1728 | /* |
1757 | /* |
1729 | * refresh matching text. |
1758 | * refresh matching text. |
1730 | */ |
1759 | */ |
1731 | bool |
1760 | bool |
1732 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) |
1761 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW |
1733 | { |
1762 | { |
1734 | bool found = false; |
1763 | bool found = false; |
1735 | |
1764 | |
1736 | for (int i = 0; i < nrow; i++) |
1765 | for (int i = 0; i < nrow; i++) |
1737 | { |
1766 | { |
1738 | int col = 0; |
|
|
1739 | rend_t *drp = drawn_buf[i].r; |
1767 | rend_t *drp = drawn_buf[i].r; |
1740 | |
1768 | |
1741 | for (; col < ncol; col++, drp++) |
1769 | for (int col = 0; col < ncol; col++, drp++) |
1742 | if ((*drp & mask) == value) |
1770 | if ((*drp & mask) == value) |
1743 | { |
1771 | { |
1744 | found = true; |
1772 | found = true; |
1745 | *drp = ~value; |
1773 | *drp = ~value; |
1746 | } |
1774 | } |
… | |
… | |
1757 | PART_END, |
1785 | PART_END, |
1758 | RC_COUNT |
1786 | RC_COUNT |
1759 | }; |
1787 | }; |
1760 | |
1788 | |
1761 | void |
1789 | void |
1762 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) |
1790 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW |
1763 | { |
1791 | { |
1764 | int i; |
1792 | int i; |
1765 | row_col_t rc[RC_COUNT]; |
1793 | row_col_t rc[RC_COUNT]; |
1766 | |
1794 | |
1767 | if (!drawn_buf) /* sanity check */ |
1795 | if (!drawn_buf) /* sanity check */ |
… | |
… | |
1786 | for (i = PART_BEG; i < RC_COUNT; i++) |
1814 | for (i = PART_BEG; i < RC_COUNT; i++) |
1787 | { |
1815 | { |
1788 | min_it (rc[i].col, ncol - 1); |
1816 | min_it (rc[i].col, ncol - 1); |
1789 | min_it (rc[i].row, nrow - 1); |
1817 | min_it (rc[i].row, nrow - 1); |
1790 | } |
1818 | } |
1791 | |
1819 | // TODO: this line somehow causes segfault if scr_expose() is called just after resize |
1792 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1820 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1793 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1821 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1794 | |
1822 | |
|
|
1823 | num_scr_allow = 0; |
|
|
1824 | |
1795 | if (refresh) |
1825 | if (refresh) |
1796 | scr_refresh (SLOW_REFRESH); |
1826 | scr_refresh (); |
1797 | } |
1827 | } |
1798 | |
1828 | |
1799 | /* ------------------------------------------------------------------------- */ |
1829 | /* ------------------------------------------------------------------------- */ |
1800 | /* |
1830 | /* |
1801 | * Refresh the entire screen |
1831 | * Refresh the entire screen |
1802 | */ |
1832 | */ |
1803 | void |
1833 | void |
1804 | rxvt_term::scr_touch (bool refresh) |
1834 | rxvt_term::scr_touch (bool refresh) NOTHROW |
1805 | { |
1835 | { |
1806 | scr_expose (0, 0, width, height, refresh); |
1836 | scr_expose (0, 0, width, height, refresh); |
1807 | } |
1837 | } |
1808 | |
1838 | |
1809 | /* ------------------------------------------------------------------------- */ |
1839 | /* ------------------------------------------------------------------------- */ |
1810 | /* |
1840 | /* |
1811 | * Move the display so that the line represented by scrollbar value Y is at |
1841 | * Move the display so that the line represented by scrollbar value Y is at |
1812 | * the top of the screen |
1842 | * the top of the screen |
1813 | */ |
1843 | */ |
1814 | void |
1844 | void |
1815 | rxvt_term::scr_move_to (int y, int len) |
1845 | rxvt_term::scr_move_to (int y, int len) NOTHROW |
1816 | { |
1846 | { |
1817 | scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); |
1847 | scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); |
1818 | } |
1848 | } |
1819 | |
1849 | |
1820 | /* ------------------------------------------------------------------------- */ |
1850 | /* ------------------------------------------------------------------------- */ |
1821 | /* |
1851 | /* |
1822 | * Page the screen up/down nlines |
1852 | * Page the screen up/down nlines |
1823 | * direction should be UP or DN |
1853 | * direction should be UP or DN |
1824 | */ |
1854 | */ |
1825 | bool |
1855 | bool |
1826 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1856 | rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW |
1827 | { |
1857 | { |
1828 | int new_view_start = |
1858 | int new_view_start = |
1829 | direction == UP ? view_start - nlines |
1859 | direction == UP ? view_start - nlines |
1830 | : view_start + nlines; |
1860 | : view_start + nlines; |
1831 | |
1861 | |
1832 | return scr_changeview (new_view_start); |
1862 | return scr_changeview (new_view_start); |
1833 | } |
1863 | } |
1834 | |
1864 | |
1835 | bool |
1865 | bool |
1836 | rxvt_term::scr_changeview (int new_view_start) |
1866 | rxvt_term::scr_changeview (int new_view_start) NOTHROW |
1837 | { |
1867 | { |
1838 | clamp_it (new_view_start, top_row, 0); |
1868 | clamp_it (new_view_start, top_row, 0); |
1839 | |
1869 | |
1840 | if (new_view_start == view_start) |
1870 | if (new_view_start == view_start) |
1841 | return false; |
1871 | return false; |
… | |
… | |
1847 | HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); |
1877 | HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); |
1848 | |
1878 | |
1849 | return true; |
1879 | return true; |
1850 | } |
1880 | } |
1851 | |
1881 | |
1852 | /* ------------------------------------------------------------------------- */ |
1882 | #ifndef NO_BELL |
1853 | void |
1883 | void |
|
|
1884 | rxvt_term::bell_cb (ev::timer &w, int revents) |
|
|
1885 | { |
|
|
1886 | rvideo_bell = false; |
|
|
1887 | scr_rvideo_mode (rvideo_mode); |
|
|
1888 | refresh_check (); |
|
|
1889 | } |
|
|
1890 | #endif |
|
|
1891 | |
|
|
1892 | /* ------------------------------------------------------------------------- */ |
|
|
1893 | void |
1854 | rxvt_term::scr_bell () |
1894 | rxvt_term::scr_bell () NOTHROW |
1855 | { |
1895 | { |
1856 | #ifndef NO_BELL |
1896 | #ifndef NO_BELL |
1857 | |
1897 | |
1858 | # ifndef NO_MAPALERT |
1898 | # ifndef NO_MAPALERT |
1859 | # ifdef MAPALERT_OPTION |
1899 | # ifdef MAPALERT_OPTION |
1860 | if (OPTION (Opt_mapAlert)) |
1900 | if (option (Opt_mapAlert)) |
1861 | # endif |
1901 | # endif |
1862 | XMapWindow (display->display, parent[0]); |
1902 | XMapWindow (dpy, parent[0]); |
1863 | # endif |
1903 | # endif |
1864 | |
1904 | |
|
|
1905 | # if ENABLE_FRILLS |
|
|
1906 | if (option (Opt_urgentOnBell)) |
|
|
1907 | set_urgency (1); |
|
|
1908 | # endif |
|
|
1909 | |
1865 | if (OPTION (Opt_visualBell)) |
1910 | if (option (Opt_visualBell)) |
1866 | { |
1911 | { |
1867 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1912 | rvideo_bell = true; |
|
|
1913 | scr_rvideo_mode (rvideo_mode); |
1868 | display->flush (); |
1914 | flush (); |
|
|
1915 | |
1869 | rxvt_usleep (VISUAL_BELL_DURATION); |
1916 | bell_ev.start (VISUAL_BELL_DURATION); |
1870 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
|
|
1871 | } |
1917 | } |
1872 | else |
1918 | else |
1873 | XBell (display->display, 0); |
1919 | XBell (dpy, 0); |
1874 | |
|
|
1875 | #endif |
1920 | #endif |
1876 | } |
1921 | } |
1877 | |
1922 | |
1878 | /* ------------------------------------------------------------------------- */ |
1923 | /* ------------------------------------------------------------------------- */ |
1879 | /* ARGSUSED */ |
1924 | /* ARGSUSED */ |
1880 | void |
1925 | void |
1881 | rxvt_term::scr_printscreen (int fullhist) |
1926 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1882 | { |
1927 | { |
1883 | #ifdef PRINTPIPE |
1928 | #ifdef PRINTPIPE |
1884 | int nrows, row_start; |
1929 | int nrows, row_start; |
1885 | FILE *fd; |
1930 | FILE *fd = popen_printer (); |
1886 | |
1931 | |
1887 | if ((fd = popen_printer ()) == NULL) |
1932 | if (!fd) |
1888 | return; |
1933 | return; |
1889 | |
1934 | |
1890 | if (fullhist) |
1935 | if (fullhist) |
1891 | { |
1936 | { |
1892 | nrows = nrow - top_row; |
1937 | nrows = nrow - top_row; |
… | |
… | |
1935 | * Refresh the screen |
1980 | * Refresh the screen |
1936 | * drawn_text/drawn_rend contain the screen information before the update. |
1981 | * drawn_text/drawn_rend contain the screen information before the update. |
1937 | * screen.text/screen.rend contain what the screen will change to. |
1982 | * screen.text/screen.rend contain what the screen will change to. |
1938 | */ |
1983 | */ |
1939 | void |
1984 | void |
1940 | rxvt_term::scr_refresh (unsigned char refresh_type) |
1985 | rxvt_term::scr_refresh () NOTHROW |
1941 | { |
1986 | { |
1942 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1987 | unsigned char have_bg, |
1943 | showcursor; /* show the cursor */ |
1988 | showcursor; /* show the cursor */ |
1944 | int16_t col, row, /* column/row we're processing */ |
1989 | int16_t col, row, /* column/row we're processing */ |
1945 | ocrow; /* old cursor row */ |
1990 | ocrow; /* old cursor row */ |
1946 | int i; /* tmp */ |
1991 | int i; /* tmp */ |
1947 | #ifndef NO_CURSORCOLOR |
1992 | #ifndef NO_CURSORCOLOR |
1948 | rend_t cc1; /* store colours at cursor position (s) */ |
1993 | rend_t cc1; /* store colours at cursor position (s) */ |
1949 | #endif |
1994 | #endif |
1950 | rend_t *crp; // cursor rendition pointer |
1995 | rend_t *crp; // cursor rendition pointer |
|
|
1996 | rend_t ccol1, /* Cursor colour */ |
|
|
1997 | ccol2; /* Cursor colour2 */ |
1951 | |
1998 | |
1952 | want_refresh = 0; /* screen is current */ |
1999 | want_refresh = 0; /* screen is current */ |
1953 | |
2000 | |
1954 | if (refresh_type == NO_REFRESH || !mapped) |
2001 | if (refresh_type == NO_REFRESH || !mapped) |
1955 | return; |
2002 | return; |
1956 | |
2003 | |
1957 | /* |
2004 | /* |
1958 | * A: set up vars |
2005 | * A: set up vars |
1959 | */ |
2006 | */ |
1960 | must_clear = 0; |
|
|
1961 | refresh_count = 0; |
2007 | refresh_count = 0; |
1962 | |
2008 | |
1963 | #if XPM_BACKGROUND |
2009 | have_bg = 0; |
|
|
2010 | #ifdef HAVE_BG_PIXMAP |
1964 | must_clear |= bgPixmap.pixmap != None; |
2011 | have_bg = bgPixmap.pixmap != None; |
1965 | #endif |
|
|
1966 | #if TRANSPARENT |
|
|
1967 | must_clear |= OPTION (Opt_transparent) && am_transparent; |
|
|
1968 | #endif |
2012 | #endif |
1969 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
2013 | ocrow = oldcursor.row; /* is there an old outline cursor on screen? */ |
1970 | |
2014 | |
1971 | /* |
2015 | /* |
1972 | * B: reverse any characters which are selected |
2016 | * B: reverse any characters which are selected |
… | |
… | |
1976 | /* |
2020 | /* |
1977 | * C: set the cursor character (s) |
2021 | * C: set the cursor character (s) |
1978 | */ |
2022 | */ |
1979 | { |
2023 | { |
1980 | unsigned char setoldcursor; |
2024 | unsigned char setoldcursor; |
1981 | rend_t ccol1, /* Cursor colour */ |
|
|
1982 | ccol2; /* Cursor colour2 */ |
|
|
1983 | |
2025 | |
1984 | showcursor = (screen.flags & Screen_VisibleCursor); |
2026 | showcursor = (screen.flags & Screen_VisibleCursor); |
1985 | #ifdef CURSOR_BLINK |
2027 | #ifdef CURSOR_BLINK |
1986 | if (hidden_cursor) |
2028 | if (hidden_cursor) |
1987 | showcursor = 0; |
2029 | showcursor = 0; |
… | |
… | |
1994 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
2036 | while (col && ROW(screen.cur.row).t[col] == NOCHAR) |
1995 | col--; |
2037 | col--; |
1996 | |
2038 | |
1997 | crp = &ROW(screen.cur.row).r[col]; |
2039 | crp = &ROW(screen.cur.row).r[col]; |
1998 | |
2040 | |
|
|
2041 | #ifndef NO_CURSORCOLOR |
|
|
2042 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2043 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2044 | ccol1 = Color_cursor; |
|
|
2045 | else |
|
|
2046 | #endif |
|
|
2047 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2048 | ccol1 = fgcolor_of (rstyle); |
|
|
2049 | #else |
|
|
2050 | ccol1 = Color_fg; |
|
|
2051 | #endif |
|
|
2052 | |
|
|
2053 | #ifndef NO_CURSORCOLOR |
|
|
2054 | if (ISSET_PIXCOLOR (Color_cursor2)) |
|
|
2055 | ccol2 = Color_cursor2; |
|
|
2056 | else |
|
|
2057 | #endif |
|
|
2058 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2059 | ccol2 = bgcolor_of (rstyle); |
|
|
2060 | #else |
|
|
2061 | ccol2 = Color_bg; |
|
|
2062 | #endif |
|
|
2063 | |
1999 | if (showcursor && focus) |
2064 | if (showcursor && focus) |
2000 | { |
2065 | { |
2001 | if (OPTION (Opt_cursorUnderline)) |
2066 | if (option (Opt_cursorUnderline)) |
2002 | *crp ^= RS_Uline; |
2067 | *crp ^= RS_Uline; |
2003 | else |
2068 | else |
2004 | { |
2069 | { |
2005 | *crp ^= RS_RVid; |
2070 | *crp ^= RS_RVid; |
2006 | |
|
|
2007 | #ifndef NO_CURSORCOLOR |
|
|
2008 | cc1 = *crp & (RS_fgMask | RS_bgMask); |
|
|
2009 | if (ISSET_PIXCOLOR (Color_cursor)) |
|
|
2010 | ccol1 = Color_cursor; |
|
|
2011 | else |
|
|
2012 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2013 | ccol1 = fgcolor_of (rstyle); |
|
|
2014 | #else |
|
|
2015 | ccol1 = Color_fg; |
|
|
2016 | #endif |
|
|
2017 | if (ISSET_PIXCOLOR (Color_cursor2)) |
|
|
2018 | ccol2 = Color_cursor2; |
|
|
2019 | else |
|
|
2020 | #ifdef CURSOR_COLOR_IS_RENDITION_COLOR |
|
|
2021 | ccol2 = bgcolor_of (rstyle); |
|
|
2022 | #else |
|
|
2023 | ccol2 = Color_bg; |
|
|
2024 | #endif |
|
|
2025 | *crp = SET_FGCOLOR (*crp, ccol1); |
2071 | *crp = SET_FGCOLOR (*crp, ccol1); |
2026 | *crp = SET_BGCOLOR (*crp, ccol2); |
2072 | *crp = SET_BGCOLOR (*crp, ccol2); |
2027 | #endif |
|
|
2028 | } |
2073 | } |
2029 | } |
2074 | } |
2030 | } |
2075 | } |
2031 | |
2076 | |
2032 | /* make sure no outline cursor is left around */ |
2077 | /* make sure no outline cursor is left around */ |
… | |
… | |
2069 | #ifndef NO_SLOW_LINK_SUPPORT |
2114 | #ifndef NO_SLOW_LINK_SUPPORT |
2070 | /* |
2115 | /* |
2071 | * D: CopyArea pass - very useful for slower links |
2116 | * D: CopyArea pass - very useful for slower links |
2072 | * This has been deliberately kept simple. |
2117 | * This has been deliberately kept simple. |
2073 | */ |
2118 | */ |
2074 | i = num_scr; |
|
|
2075 | if (!display->is_local |
2119 | if (!display->is_local |
2076 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2120 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2077 | && abs (num_scr) < nrow && !must_clear) |
2121 | && abs (num_scr) < nrow && !have_bg) |
2078 | { |
2122 | { |
2079 | int16_t nits; |
2123 | int16_t nits; |
|
|
2124 | int i = num_scr; |
2080 | int j; |
2125 | int j; |
2081 | int len, wlen; |
2126 | int len, wlen; |
|
|
2127 | dLocal (int, num_scr); |
2082 | |
2128 | |
2083 | j = nrow; |
2129 | j = nrow; |
2084 | wlen = len = -1; |
2130 | wlen = len = -1; |
2085 | row = i > 0 ? 0 : j - 1; |
2131 | row = i > 0 ? 0 : j - 1; |
|
|
2132 | |
2086 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2133 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2087 | { |
2134 | { |
2088 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2135 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2089 | { |
2136 | { |
2090 | line_t s = ROW(view_start + row); |
2137 | line_t s = ROW(view_start + row); |
… | |
… | |
2111 | wlen = row; |
2158 | wlen = row; |
2112 | continue; |
2159 | continue; |
2113 | } |
2160 | } |
2114 | } |
2161 | } |
2115 | |
2162 | |
2116 | if (len != -1) |
2163 | if (len >= 0) |
2117 | { |
2164 | { |
2118 | /* also comes here at end if needed because of >= above */ |
2165 | /* also comes here at end if needed because of >= above */ |
2119 | if (wlen < len) |
2166 | if (wlen < len) |
2120 | ::swap (wlen, len); |
2167 | ::swap (wlen, len); |
2121 | |
2168 | |
|
|
2169 | XGCValues gcv; |
|
|
2170 | |
|
|
2171 | gcv.graphics_exposures = 1; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
2122 | XCopyArea (display->display, vt, vt, |
2172 | XCopyArea (dpy, vt, vt, |
2123 | gc, 0, Row2Pixel (len + i), |
2173 | gc, 0, Row2Pixel (len + i), |
2124 | (unsigned int)this->width, |
2174 | (unsigned int)this->width, |
2125 | (unsigned int)Height2Pixel (wlen - len + 1), |
2175 | (unsigned int)Height2Pixel (wlen - len + 1), |
2126 | 0, Row2Pixel (len)); |
2176 | 0, Row2Pixel (len)); |
|
|
2177 | gcv.graphics_exposures = 0; XChangeGC (dpy, gc, GCGraphicsExposures, &gcv); |
|
|
2178 | |
2127 | len = -1; |
2179 | len = -1; |
2128 | } |
2180 | } |
2129 | } |
2181 | } |
2130 | } |
2182 | } |
2131 | #endif |
2183 | #endif |
… | |
… | |
2155 | continue; |
2207 | continue; |
2156 | |
2208 | |
2157 | // redraw one or more characters |
2209 | // redraw one or more characters |
2158 | |
2210 | |
2159 | // seek to the beginning of wide characters |
2211 | // seek to the beginning of wide characters |
2160 | while (stp[col] == NOCHAR && col > 0) |
2212 | while (expect_false (stp[col] == NOCHAR && col > 0)) |
2161 | --col; |
2213 | --col; |
2162 | |
2214 | |
2163 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2215 | rend_t rend = srp[col]; /* screen rendition (target rendtion) */ |
2164 | text_t *text = stp + col; |
2216 | text_t *text = stp + col; |
2165 | int count = 1; |
2217 | int count = 1; |
… | |
… | |
2187 | count++; |
2239 | count++; |
2188 | |
2240 | |
2189 | if (stp[col] != dtp[col] |
2241 | if (stp[col] != dtp[col] |
2190 | || !RS_SAME (srp[col], drp[col])) |
2242 | || !RS_SAME (srp[col], drp[col])) |
2191 | { |
2243 | { |
2192 | if (must_clear && (i++ > count / 2)) |
2244 | if (have_bg && (i++ > count / 2)) |
2193 | break; |
2245 | break; |
2194 | |
2246 | |
2195 | dtp[col] = stp[col]; |
2247 | dtp[col] = stp[col]; |
2196 | drp[col] = rend; |
2248 | drp[col] = rend; |
2197 | i = 0; |
2249 | i = 0; |
2198 | } |
2250 | } |
2199 | else if (must_clear || (stp[col] != ' ' && ++i >= 16)) |
2251 | else if (have_bg || (stp[col] != ' ' && ++i >= 16)) |
2200 | break; |
2252 | break; |
2201 | } |
2253 | } |
2202 | |
2254 | |
2203 | col--; /* went one too far. move back */ |
2255 | col--; /* went one too far. move back */ |
2204 | count -= i; /* dump any matching trailing chars */ |
2256 | count -= i; /* dump any matching trailing chars */ |
2205 | |
2257 | |
2206 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2258 | // sometimes we optimize away the trailing NOCHAR's, add them back |
2207 | while (i && text[count] == NOCHAR) |
2259 | while (expect_false (i && text[count] == NOCHAR)) |
2208 | count++, i--; |
2260 | count++, i--; |
2209 | |
2261 | |
2210 | /* |
2262 | /* |
2211 | * Determine the attributes for the string |
2263 | * Determine the attributes for the string |
2212 | */ |
2264 | */ |
2213 | int fore = fgcolor_of (rend); // desired foreground |
2265 | int fore = fgcolor_of (rend); // desired foreground |
2214 | int back = bgcolor_of (rend); // desired background |
2266 | int back = bgcolor_of (rend); // desired background |
2215 | |
2267 | |
2216 | // only do special processing if any attributes are set, which is unlikely |
2268 | // only do special processing if any attributes are set, which is unlikely |
2217 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2269 | if (expect_false (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful))) |
2218 | { |
2270 | { |
2219 | #if ENABLE_STYLES |
|
|
2220 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2221 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
|
|
2222 | drp[col + 1] = ~srp[col + 1]; |
|
|
2223 | |
|
|
2224 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2225 | while (text > stp |
|
|
2226 | && srp[text - stp - 1] & RS_Careful |
|
|
2227 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2228 | text--, count++, xpixel -= fwidth; |
|
|
2229 | #endif |
|
|
2230 | |
|
|
2231 | bool invert = rend & RS_RVid; |
2271 | bool invert = rend & RS_RVid; |
2232 | |
2272 | |
2233 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2273 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2234 | if (rend & RS_Bold |
|
|
2235 | && fore == Color_fg) |
2274 | if (rend & RS_Bold && fore == Color_fg) |
2236 | { |
2275 | { |
2237 | if (ISSET_PIXCOLOR (Color_BD)) |
2276 | if (ISSET_PIXCOLOR (Color_BD)) |
2238 | fore = Color_BD; |
2277 | fore = Color_BD; |
2239 | # if !ENABLE_STYLES |
2278 | # if !ENABLE_STYLES |
2240 | else |
2279 | else |
2241 | invert = !invert; |
2280 | invert = !invert; |
2242 | # endif |
2281 | # endif |
2243 | } |
2282 | } |
2244 | |
2283 | |
2245 | if (rend & RS_Italic |
2284 | if (rend & RS_Italic && fore == Color_fg) |
2246 | && fore == Color_fg) |
|
|
2247 | { |
2285 | { |
2248 | if (ISSET_PIXCOLOR (Color_IT)) |
2286 | if (ISSET_PIXCOLOR (Color_IT)) |
2249 | fore = Color_IT; |
2287 | fore = Color_IT; |
2250 | # if !ENABLE_STYLES |
2288 | # if !ENABLE_STYLES |
2251 | else |
2289 | else |
2252 | invert = !invert; |
2290 | invert = !invert; |
2253 | # endif |
2291 | # endif |
2254 | } |
2292 | } |
2255 | |
2293 | |
2256 | if (rend & RS_Uline && ISSET_PIXCOLOR (Color_UL)) |
2294 | if (rend & RS_Uline && fore == Color_fg && ISSET_PIXCOLOR (Color_UL)) |
2257 | fore = Color_UL; |
2295 | fore = Color_UL; |
2258 | #endif |
2296 | #endif |
2259 | |
2297 | |
2260 | if (invert) |
2298 | if (invert) |
2261 | { |
2299 | { |
|
|
2300 | #ifdef OPTION_HC |
|
|
2301 | if ((showcursor && row == screen.cur.row && text - stp == screen.cur.col) |
|
|
2302 | || !ISSET_PIXCOLOR (Color_HC)) |
|
|
2303 | #endif |
|
|
2304 | /* invert the column if no highlightColor is set or it is the |
|
|
2305 | * current cursor column */ |
2262 | ::swap (fore, back); |
2306 | ::swap (fore, back); |
|
|
2307 | #ifdef OPTION_HC |
|
|
2308 | else if (ISSET_PIXCOLOR (Color_HC)) |
|
|
2309 | back = Color_HC; |
|
|
2310 | #endif |
2263 | |
2311 | |
2264 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2312 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
|
|
2313 | # ifndef OPTION_HC |
2265 | if (ISSET_PIXCOLOR (Color_RV)) |
2314 | if (ISSET_PIXCOLOR (Color_RV)) |
2266 | back = Color_RV; |
2315 | back = Color_RV; |
2267 | |
2316 | # endif |
2268 | if (fore == back) |
2317 | if (fore == back) |
2269 | { |
2318 | { |
2270 | fore = Color_bg; |
2319 | fore = Color_bg; |
2271 | back = Color_fg; |
2320 | back = Color_fg; |
2272 | } |
2321 | } |
… | |
… | |
2274 | } |
2323 | } |
2275 | |
2324 | |
2276 | #ifdef TEXT_BLINK |
2325 | #ifdef TEXT_BLINK |
2277 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2326 | if (rend & RS_Blink && (back == Color_bg || fore == Color_bg)) |
2278 | { |
2327 | { |
2279 | if (!text_blink_ev.active) |
2328 | if (!text_blink_ev.is_active ()) |
2280 | { |
2329 | { |
2281 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
2330 | text_blink_ev.again (); |
2282 | hidden_text = 0; |
2331 | hidden_text = 0; |
2283 | } |
2332 | } |
2284 | else if (hidden_text) |
2333 | else if (hidden_text) |
2285 | fore = back; |
2334 | fore = back; |
2286 | } |
2335 | } |
2287 | #endif |
2336 | #endif |
|
|
2337 | |
|
|
2338 | #if ENABLE_STYLES |
|
|
2339 | // "careful" (too wide) character handling |
|
|
2340 | |
|
|
2341 | // include previous careful character(s) if possible, looks nicer (best effort...) |
|
|
2342 | while (text > stp |
|
|
2343 | && srp[text - stp - 1] & RS_Careful |
|
|
2344 | && RS_SAME (rend, srp[text - stp - 1])) |
|
|
2345 | text--, count++, xpixel -= fwidth; |
|
|
2346 | |
|
|
2347 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2348 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
|
|
2349 | drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw; |
|
|
2350 | |
|
|
2351 | // force redraw before "careful" characters to avoid pixel droppings |
|
|
2352 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
|
|
2353 | drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw; |
|
|
2354 | #endif |
2288 | } |
2355 | } |
2289 | |
2356 | |
2290 | /* |
2357 | /* |
2291 | * Actually do the drawing of the string here |
2358 | * Actually do the drawing of the string here |
2292 | */ |
2359 | */ |
2293 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2360 | rxvt_font *font = (*fontset[GET_STYLE (rend)])[GET_FONT (rend)]; |
2294 | |
2361 | |
2295 | if (back == fore) |
2362 | if (expect_true (have_bg && back == Color_bg)) |
2296 | font->clear_rect (*drawable, xpixel, ypixel, |
|
|
2297 | fwidth * count, fheight, |
|
|
2298 | back); |
|
|
2299 | else if (back == Color_bg) |
|
|
2300 | { |
2363 | { |
2301 | if (must_clear) |
2364 | // this is very ugly, maybe push it into ->draw? |
2302 | { |
|
|
2303 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2304 | |
2365 | |
2305 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2366 | for (i = 0; i < count; i++) /* don't draw empty strings */ |
2306 | if (text[i] != ' ') |
2367 | if (text[i] != ' ') |
2307 | { |
2368 | { |
2308 | font->draw (*drawable, xpixel, ypixel, text, count, fore, -1); |
2369 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_transparent); |
2309 | break; |
2370 | goto did_clear; |
2310 | } |
|
|
2311 | } |
2371 | } |
2312 | else |
2372 | |
2313 | font->draw (*drawable, xpixel, ypixel, text, count, fore, Color_bg); |
2373 | CLEAR_CHARS (xpixel, ypixel, count); |
|
|
2374 | did_clear: ; |
2314 | } |
2375 | } |
2315 | else |
2376 | else |
2316 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2377 | font->draw (*drawable, xpixel, ypixel, text, count, fore, back); |
2317 | |
2378 | |
2318 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2379 | if (expect_false (rend & RS_Uline && font->descent > 1 && fore != back)) |
2319 | { |
2380 | { |
2320 | #if ENABLE_FRILLS |
2381 | #if ENABLE_FRILLS |
2321 | if (ISSET_PIXCOLOR (Color_underline)) |
2382 | if (ISSET_PIXCOLOR (Color_underline)) |
2322 | XSetForeground (display->display, gc, pix_colors[Color_underline]); |
2383 | XSetForeground (dpy, gc, pix_colors[Color_underline]); |
2323 | else |
2384 | else |
2324 | #endif |
2385 | #endif |
2325 | XSetForeground (display->display, gc, pix_colors[fore]); |
2386 | XSetForeground (dpy, gc, pix_colors[fore]); |
2326 | |
2387 | |
2327 | XDrawLine (display->display, drawBuffer, gc, |
2388 | XDrawLine (dpy, vt, gc, |
2328 | xpixel, ypixel + font->ascent + 1, |
2389 | xpixel, ypixel + font->ascent + 1, |
2329 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2390 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2330 | } |
2391 | } |
2331 | } /* for (col....) */ |
2392 | } /* for (col....) */ |
2332 | } /* for (row....) */ |
2393 | } /* for (row....) */ |
… | |
… | |
2341 | */ |
2402 | */ |
2342 | if (showcursor) |
2403 | if (showcursor) |
2343 | { |
2404 | { |
2344 | if (focus) |
2405 | if (focus) |
2345 | { |
2406 | { |
2346 | if (OPTION (Opt_cursorUnderline)) |
2407 | if (option (Opt_cursorUnderline)) |
2347 | *crp ^= RS_Uline; |
2408 | *crp ^= RS_Uline; |
2348 | else |
2409 | else |
2349 | { |
2410 | { |
2350 | *crp ^= RS_RVid; |
2411 | *crp ^= RS_RVid; |
2351 | #ifndef NO_CURSORCOLOR |
2412 | #ifndef NO_CURSORCOLOR |
… | |
… | |
2365 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2426 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2366 | cursorwidth++; |
2427 | cursorwidth++; |
2367 | |
2428 | |
2368 | #ifndef NO_CURSORCOLOR |
2429 | #ifndef NO_CURSORCOLOR |
2369 | if (ISSET_PIXCOLOR (Color_cursor)) |
2430 | if (ISSET_PIXCOLOR (Color_cursor)) |
2370 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
2431 | XSetForeground (dpy, gc, pix_colors[Color_cursor]); |
|
|
2432 | else |
2371 | #endif |
2433 | #endif |
|
|
2434 | XSetForeground (dpy, gc, pix_colors[ccol1]); |
2372 | |
2435 | |
2373 | XDrawRectangle (display->display, drawBuffer, gc, |
2436 | XDrawRectangle (dpy, vt, gc, |
2374 | Col2Pixel (col), |
2437 | Col2Pixel (col), |
2375 | Row2Pixel (oldcursor.row), |
2438 | Row2Pixel (oldcursor.row), |
2376 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2439 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2377 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2440 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2378 | } |
2441 | } |
… | |
… | |
2386 | num_scr = 0; |
2449 | num_scr = 0; |
2387 | num_scr_allow = 1; |
2450 | num_scr_allow = 1; |
2388 | } |
2451 | } |
2389 | |
2452 | |
2390 | void |
2453 | void |
2391 | rxvt_term::scr_remap_chars (line_t &l) |
2454 | rxvt_term::scr_remap_chars (line_t &l) NOTHROW |
2392 | { |
2455 | { |
2393 | if (!l.t) |
2456 | if (!l.t) |
2394 | return; |
2457 | return; |
2395 | |
2458 | |
2396 | l.touch (); // maybe a bit of an overkill, but it's not performance-relevant |
2459 | l.touch (); // maybe a bit of an overkill, but it's not performance-relevant |
… | |
… | |
2398 | for (int i = ncol; i--; ) |
2461 | for (int i = ncol; i--; ) |
2399 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2462 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2400 | } |
2463 | } |
2401 | |
2464 | |
2402 | void |
2465 | void |
2403 | rxvt_term::scr_remap_chars () |
2466 | rxvt_term::scr_remap_chars () NOTHROW |
2404 | { |
2467 | { |
2405 | for (int i = total_rows; i--; ) |
2468 | for (int i = total_rows; i--; ) |
2406 | scr_remap_chars (row_buf [i]); |
2469 | scr_remap_chars (row_buf [i]); |
2407 | |
2470 | |
2408 | for (int i = nrow; i--; ) |
2471 | for (int i = nrow; i--; ) |
… | |
… | |
2411 | scr_remap_chars (swap_buf [i]); |
2474 | scr_remap_chars (swap_buf [i]); |
2412 | } |
2475 | } |
2413 | } |
2476 | } |
2414 | |
2477 | |
2415 | void |
2478 | void |
2416 | rxvt_term::scr_recolour () |
2479 | rxvt_term::scr_recolour () NOTHROW |
2417 | { |
2480 | { |
2418 | if (1 |
2481 | #ifdef HAVE_BG_PIXMAP |
2419 | #if TRANSPARENT |
2482 | bgPixmap.apply (); |
2420 | && !am_transparent |
2483 | #else |
2421 | #endif |
2484 | |
2422 | #if XPM_BACKGROUND |
|
|
2423 | && !bgPixmap.pixmap |
|
|
2424 | #endif |
|
|
2425 | ) |
|
|
2426 | { |
|
|
2427 | XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); |
2485 | XSetWindowBackground (dpy, parent[0], pix_colors[Color_border]); |
2428 | XClearWindow (display->display, parent[0]); |
2486 | XClearWindow (dpy, parent[0]); |
2429 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
2487 | XSetWindowBackground (dpy, vt, pix_colors[Color_bg]); |
2430 | #if HAVE_SCROLLBARS |
2488 | |
2431 | if (scrollBar.win) |
2489 | if (scrollBar.win) |
2432 | { |
2490 | { |
2433 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
2491 | XSetWindowBackground (dpy, scrollBar.win, pix_colors[Color_border]); |
2434 | scrollBar.setIdle (); |
2492 | scrollBar.state = STATE_IDLE; |
2435 | scrollbar_show (0); |
2493 | scrollBar.show (0); |
2436 | } |
|
|
2437 | #endif |
|
|
2438 | } |
2494 | } |
2439 | |
2495 | |
|
|
2496 | #endif |
|
|
2497 | |
|
|
2498 | /* bgPixmap.apply () does not do the following : */ |
2440 | scr_clear (); |
2499 | scr_clear (); |
2441 | scr_touch (true); |
2500 | scr_touch (true); |
2442 | want_refresh = 1; |
2501 | want_refresh = 1; |
2443 | } |
2502 | } |
2444 | |
2503 | |
2445 | /* ------------------------------------------------------------------------- */ |
2504 | /* ------------------------------------------------------------------------- */ |
2446 | void |
2505 | void |
2447 | rxvt_term::scr_clear (bool really) |
2506 | rxvt_term::scr_clear (bool really) NOTHROW |
2448 | { |
2507 | { |
2449 | if (!mapped) |
2508 | if (!mapped) |
2450 | return; |
2509 | return; |
2451 | |
2510 | |
2452 | num_scr_allow = 0; |
2511 | num_scr_allow = 0; |
2453 | want_refresh = 1; |
2512 | want_refresh = 1; |
2454 | |
2513 | |
2455 | if (really) |
2514 | if (really) |
2456 | XClearWindow (display->display, vt); |
2515 | XClearWindow (dpy, vt); |
2457 | } |
2516 | } |
2458 | |
2517 | |
2459 | void |
2518 | void |
2460 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) |
2519 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW |
2461 | { |
2520 | { |
2462 | int view_end = view_start + nrow; |
2521 | int view_end = view_start + nrow; |
2463 | int row, col; |
2522 | int row, col; |
2464 | |
2523 | |
2465 | for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) |
2524 | for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) |
… | |
… | |
2477 | srp[col] ^= rstyle2; |
2536 | srp[col] ^= rstyle2; |
2478 | } |
2537 | } |
2479 | } |
2538 | } |
2480 | |
2539 | |
2481 | void |
2540 | void |
2482 | rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) |
2541 | rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW |
2483 | { |
2542 | { |
2484 | int view_end = view_start + nrow; |
2543 | int view_end = view_start + nrow; |
2485 | int row, col; |
2544 | int row, col; |
2486 | |
2545 | |
2487 | if (beg_row >= view_start) |
2546 | if (beg_row >= view_start) |
… | |
… | |
2504 | srp[col] ^= rstyle; |
2563 | srp[col] ^= rstyle; |
2505 | } |
2564 | } |
2506 | |
2565 | |
2507 | /* ------------------------------------------------------------------------- */ |
2566 | /* ------------------------------------------------------------------------- */ |
2508 | void |
2567 | void |
2509 | rxvt_term::scr_reverse_selection () |
2568 | rxvt_term::scr_reverse_selection () NOTHROW |
2510 | { |
2569 | { |
2511 | if (selection.op |
2570 | if (selection.op |
2512 | && current_screen == selection.screen |
2571 | && current_screen == selection.screen |
2513 | && selection.end.row >= view_start) |
2572 | && selection.end.row >= view_start) |
2514 | { |
2573 | { |
2515 | #if ENABLE_FRILLS |
2574 | #if !ENABLE_MINIMAL |
2516 | if (selection.rect) |
2575 | if (selection.rect) |
2517 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2576 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2518 | selection.end.row, selection.end.col, |
2577 | selection.end.row, selection.end.col, |
2519 | RS_RVid, RS_RVid | RS_Uline); |
2578 | RS_RVid, RS_RVid | RS_Uline); |
2520 | else |
2579 | else |
… | |
… | |
2530 | * Dump the whole scrollback and screen to the passed filedescriptor. The |
2589 | * Dump the whole scrollback and screen to the passed filedescriptor. The |
2531 | * invoking routine must close the fd. |
2590 | * invoking routine must close the fd. |
2532 | */ |
2591 | */ |
2533 | #if 0 |
2592 | #if 0 |
2534 | void |
2593 | void |
2535 | rxvt_term::scr_dump (int fd) |
2594 | rxvt_term::scr_dump (int fd) NOTHROW |
2536 | { |
2595 | { |
2537 | int row, wrote; |
2596 | int row, wrote; |
2538 | unsigned int width, towrite; |
2597 | unsigned int width, towrite; |
2539 | char r1[] = "\n"; |
2598 | char r1[] = "\n"; |
2540 | |
2599 | |
2541 | for (row = saveLines - nsaved; |
2600 | for (row = saveLines + top_row; |
2542 | row < saveLines + nrow - 1; row++) |
2601 | row < saveLines + nrow - 1; row++) |
2543 | { |
2602 | { |
2544 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2603 | width = row_buf[row].l >= 0 ? row_buf[row].l |
2545 | : ncol; |
2604 | : ncol; |
2546 | for (towrite = width; towrite; towrite -= wrote) |
2605 | for (towrite = width; towrite; towrite -= wrote) |
… | |
… | |
2559 | |
2618 | |
2560 | /* ------------------------------------------------------------------------- * |
2619 | /* ------------------------------------------------------------------------- * |
2561 | * CHARACTER SELECTION * |
2620 | * CHARACTER SELECTION * |
2562 | * ------------------------------------------------------------------------- */ |
2621 | * ------------------------------------------------------------------------- */ |
2563 | void |
2622 | void |
2564 | rxvt_term::selection_check (int check_more) |
2623 | rxvt_term::selection_check (int check_more) NOTHROW |
2565 | { |
2624 | { |
2566 | row_col_t pos; |
2625 | row_col_t pos; |
2567 | |
2626 | |
2568 | if (!selection.op) |
2627 | if (!selection.op) |
2569 | return; |
2628 | return; |
… | |
… | |
2590 | /* ------------------------------------------------------------------------- */ |
2649 | /* ------------------------------------------------------------------------- */ |
2591 | /* |
2650 | /* |
2592 | * Paste a selection direct to the command fd |
2651 | * Paste a selection direct to the command fd |
2593 | */ |
2652 | */ |
2594 | void |
2653 | void |
2595 | rxvt_term::paste (char *data, unsigned int len) |
2654 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2596 | { |
2655 | { |
2597 | /* convert normal newline chars into common keyboard Return key sequence */ |
2656 | /* convert normal newline chars into common keyboard Return key sequence */ |
2598 | for (unsigned int i = 0; i < len; i++) |
2657 | for (unsigned int i = 0; i < len; i++) |
2599 | if (data[i] == C0_LF) |
2658 | if (data[i] == C0_LF) |
2600 | data[i] = C0_CR; |
2659 | data[i] = C0_CR; |
2601 | |
2660 | |
|
|
2661 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2662 | tt_printf ("\e[200~"); |
|
|
2663 | |
2602 | tt_write (data, len); |
2664 | tt_write (data, len); |
|
|
2665 | |
|
|
2666 | if (priv_modes & PrivMode_BracketPaste) |
|
|
2667 | tt_printf ("\e[201~"); |
2603 | } |
2668 | } |
2604 | |
2669 | |
2605 | /* ------------------------------------------------------------------------- */ |
2670 | /* ------------------------------------------------------------------------- */ |
2606 | /* |
2671 | /* |
2607 | * Respond to a notification that a primary selection has been sent |
2672 | * Respond to a notification that a primary selection has been sent |
2608 | * EXT: SelectionNotify |
2673 | * EXT: SelectionNotify |
2609 | */ |
2674 | */ |
2610 | void |
2675 | void |
2611 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) |
2676 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW |
2612 | { |
2677 | { |
2613 | if (prop == None) /* check for failed XConvertSelection */ |
2678 | if (prop == None) /* check for failed XConvertSelection */ |
2614 | { |
2679 | { |
2615 | if ((selection_type & Sel_CompoundText)) |
2680 | if ((selection_type & Sel_CompoundText)) |
2616 | { |
2681 | { |
… | |
… | |
2636 | } |
2701 | } |
2637 | |
2702 | |
2638 | unsigned long bytes_after; |
2703 | unsigned long bytes_after; |
2639 | XTextProperty ct; |
2704 | XTextProperty ct; |
2640 | |
2705 | |
2641 | if (XGetWindowProperty (display->display, win, prop, |
2706 | if (XGetWindowProperty (dpy, win, prop, |
2642 | 0, PROP_SIZE / 4, |
2707 | 0, PROP_SIZE / 4, |
2643 | delete_prop, AnyPropertyType, |
2708 | delete_prop, AnyPropertyType, |
2644 | &ct.encoding, &ct.format, |
2709 | &ct.encoding, &ct.format, |
2645 | &ct.nitems, &bytes_after, |
2710 | &ct.nitems, &bytes_after, |
2646 | &ct.value) != Success) |
2711 | &ct.value) != Success) |
… | |
… | |
2655 | if (bytes_after) |
2720 | if (bytes_after) |
2656 | { |
2721 | { |
2657 | // fetch and append remaining data |
2722 | // fetch and append remaining data |
2658 | XTextProperty ct2; |
2723 | XTextProperty ct2; |
2659 | |
2724 | |
2660 | if (XGetWindowProperty (display->display, win, prop, |
2725 | if (XGetWindowProperty (dpy, win, prop, |
2661 | ct.nitems / 4, (bytes_after + 3) / 4, |
2726 | ct.nitems / 4, (bytes_after + 3) / 4, |
2662 | delete_prop, AnyPropertyType, |
2727 | delete_prop, AnyPropertyType, |
2663 | &ct2.encoding, &ct2.format, |
2728 | &ct2.encoding, &ct2.format, |
2664 | &ct2.nitems, &bytes_after, |
2729 | &ct2.nitems, &bytes_after, |
2665 | &ct2.value) != Success) |
2730 | &ct2.value) != Success) |
… | |
… | |
2678 | |
2743 | |
2679 | if (ct.encoding == xa[XA_INCR]) |
2744 | if (ct.encoding == xa[XA_INCR]) |
2680 | { |
2745 | { |
2681 | // INCR selection, start handshake |
2746 | // INCR selection, start handshake |
2682 | if (!delete_prop) |
2747 | if (!delete_prop) |
2683 | XDeleteProperty (display->display, win, prop); |
2748 | XDeleteProperty (dpy, win, prop); |
2684 | |
2749 | |
2685 | selection_wait = Sel_incr; |
2750 | selection_wait = Sel_incr; |
2686 | incr_buf_fill = 0; |
2751 | incr_buf_fill = 0; |
2687 | incr_ev.start (NOW + 10); |
2752 | incr_ev.start (10); |
2688 | |
2753 | |
2689 | goto bailout; |
2754 | goto bailout; |
2690 | } |
2755 | } |
2691 | |
2756 | |
2692 | if (ct.nitems == 0) |
2757 | if (ct.nitems == 0) |
… | |
… | |
2701 | ct.nitems = incr_buf_fill; |
2766 | ct.nitems = incr_buf_fill; |
2702 | incr_buf = 0; |
2767 | incr_buf = 0; |
2703 | incr_buf_size = 0; |
2768 | incr_buf_size = 0; |
2704 | incr_ev.stop (); |
2769 | incr_ev.stop (); |
2705 | } |
2770 | } |
2706 | else |
2771 | else |
2707 | { |
2772 | { |
2708 | if (selection_wait == Sel_normal |
2773 | if (selection_wait == Sel_normal |
2709 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2774 | && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion |
2710 | { |
2775 | { |
2711 | /* |
2776 | /* |
… | |
… | |
2718 | goto bailout; |
2783 | goto bailout; |
2719 | } |
2784 | } |
2720 | } |
2785 | } |
2721 | else if (selection_wait == Sel_incr) |
2786 | else if (selection_wait == Sel_incr) |
2722 | { |
2787 | { |
2723 | incr_ev.start (NOW + 10); |
2788 | incr_ev.start (10); |
2724 | |
2789 | |
2725 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2790 | while (incr_buf_fill + ct.nitems > incr_buf_size) |
2726 | { |
2791 | { |
2727 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2792 | incr_buf_size = incr_buf_size ? incr_buf_size * 2 : 128*1024; |
2728 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
2793 | incr_buf = (char *)realloc (incr_buf, incr_buf_size); |
… | |
… | |
2735 | } |
2800 | } |
2736 | |
2801 | |
2737 | char **cl; |
2802 | char **cl; |
2738 | int cr; |
2803 | int cr; |
2739 | |
2804 | |
2740 | #if ENABLE_FRILLS |
2805 | #if !ENABLE_MINIMAL |
2741 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2806 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2742 | // so recode it manually |
2807 | // so recode it manually |
2743 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2808 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2744 | { |
2809 | { |
2745 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2810 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
… | |
… | |
2749 | paste (s, strlen (s)); |
2814 | paste (s, strlen (s)); |
2750 | free (s); |
2815 | free (s); |
2751 | } |
2816 | } |
2752 | else |
2817 | else |
2753 | #endif |
2818 | #endif |
2754 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2819 | if (XmbTextPropertyToTextList (dpy, &ct, &cl, &cr) >= 0 |
2755 | && cl) |
2820 | && cl) |
2756 | { |
2821 | { |
2757 | for (int i = 0; i < cr; i++) |
2822 | for (int i = 0; i < cr; i++) |
2758 | paste (cl[i], strlen (cl[i])); |
2823 | paste (cl[i], strlen (cl[i])); |
2759 | |
2824 | |
… | |
… | |
2768 | if (selection_wait == Sel_normal) |
2833 | if (selection_wait == Sel_normal) |
2769 | selection_wait = Sel_none; |
2834 | selection_wait = Sel_none; |
2770 | } |
2835 | } |
2771 | |
2836 | |
2772 | void |
2837 | void |
2773 | rxvt_term::incr_cb (time_watcher &w) |
2838 | rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW |
2774 | { |
2839 | { |
2775 | selection_wait = Sel_none; |
2840 | selection_wait = Sel_none; |
2776 | |
2841 | |
2777 | incr_buf_size = 0; |
2842 | incr_buf_size = 0; |
2778 | free (incr_buf); |
2843 | free (incr_buf); |
2779 | |
2844 | |
2780 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2845 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2781 | } |
2846 | } |
2782 | |
2847 | |
2783 | void |
2848 | void |
2784 | rxvt_term::selection_property (Window win, Atom prop) |
2849 | rxvt_term::selection_property (Window win, Atom prop) NOTHROW |
2785 | { |
2850 | { |
2786 | if (prop == None || selection_wait != Sel_incr) |
2851 | if (prop == None || selection_wait != Sel_incr) |
2787 | return; |
2852 | return; |
2788 | |
2853 | |
2789 | selection_paste (win, prop, true); |
2854 | selection_paste (win, prop, true); |
2790 | } |
2855 | } |
2791 | |
2856 | |
2792 | /* ------------------------------------------------------------------------- */ |
2857 | /* ------------------------------------------------------------------------- */ |
2793 | /* |
2858 | /* |
2794 | * Request the current selection: |
2859 | * Request the current selection: |
2795 | * Order: > internal selection if available |
2860 | * Order: > internal selection if available |
2796 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2861 | * > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+) |
2797 | * > CUT_BUFFER0 |
2862 | * > CUT_BUFFER0 |
2798 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2863 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2799 | * will auto fallback to CUT_BUFFER0 |
2864 | * will auto fallback to CUT_BUFFER0 |
2800 | * EXT: button 2 release |
2865 | * EXT: button 2 release |
2801 | */ |
2866 | */ |
2802 | void |
2867 | void |
2803 | rxvt_term::selection_request (Time tm, int x, int y) |
2868 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2804 | { |
2869 | { |
2805 | if (x < 0 || x >= width || y < 0 || y >= height) |
2870 | if (selection.text && selnum == Sel_Primary) |
2806 | return; /* outside window */ |
2871 | { |
2807 | |
|
|
2808 | if (selection.text) |
|
|
2809 | { /* internal selection */ |
2872 | /* internal selection */ |
2810 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2873 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2811 | paste (str, strlen (str)); |
2874 | paste (str, strlen (str)); |
2812 | free (str); |
2875 | free (str); |
2813 | return; |
2876 | return; |
2814 | } |
2877 | } |
2815 | else |
2878 | else |
2816 | { |
2879 | { |
2817 | int i; |
|
|
2818 | |
|
|
2819 | selection_request_time = tm; |
2880 | selection_request_time = tm; |
2820 | selection_wait = Sel_normal; |
2881 | selection_wait = Sel_normal; |
2821 | |
2882 | |
2822 | for (i = Sel_Primary; i <= Sel_Clipboard; i++) |
|
|
2823 | { |
|
|
2824 | #if X_HAVE_UTF8_STRING |
2883 | #if X_HAVE_UTF8_STRING |
2825 | selection_type = Sel_UTF8String; |
2884 | selection_type = Sel_UTF8String; |
2826 | if (selection_request_other (xa[XA_UTF8_STRING], i)) |
2885 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
2827 | return; |
2886 | return; |
2828 | #else |
2887 | #else |
2829 | selection_type = Sel_CompoundText; |
2888 | selection_type = Sel_CompoundText; |
2830 | if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) |
2889 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
2831 | return; |
2890 | return; |
2832 | #endif |
2891 | #endif |
2833 | } |
|
|
2834 | } |
2892 | } |
2835 | |
2893 | |
2836 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2894 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2837 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2895 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2838 | } |
2896 | } |
2839 | |
2897 | |
2840 | int |
2898 | int |
2841 | rxvt_term::selection_request_other (Atom target, int selnum) |
2899 | rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW |
2842 | { |
2900 | { |
2843 | Atom sel; |
2901 | Atom sel; |
2844 | |
2902 | |
2845 | selection_type |= selnum; |
2903 | selection_type |= selnum; |
2846 | |
2904 | |
… | |
… | |
2849 | else if (selnum == Sel_Secondary) |
2907 | else if (selnum == Sel_Secondary) |
2850 | sel = XA_SECONDARY; |
2908 | sel = XA_SECONDARY; |
2851 | else |
2909 | else |
2852 | sel = xa[XA_CLIPBOARD]; |
2910 | sel = xa[XA_CLIPBOARD]; |
2853 | |
2911 | |
2854 | if (XGetSelectionOwner (display->display, sel) != None) |
2912 | if (XGetSelectionOwner (dpy, sel) != None) |
2855 | { |
2913 | { |
2856 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2914 | XConvertSelection (dpy, sel, target, xa[XA_VT_SELECTION], |
2857 | vt, selection_request_time); |
2915 | vt, selection_request_time); |
2858 | return 1; |
2916 | return 1; |
2859 | } |
2917 | } |
2860 | |
2918 | |
2861 | return 0; |
2919 | return 0; |
… | |
… | |
2865 | /* |
2923 | /* |
2866 | * Clear all selected text |
2924 | * Clear all selected text |
2867 | * EXT: SelectionClear |
2925 | * EXT: SelectionClear |
2868 | */ |
2926 | */ |
2869 | void |
2927 | void |
2870 | rxvt_term::selection_clear () |
2928 | rxvt_term::selection_clear () NOTHROW |
2871 | { |
2929 | { |
2872 | want_refresh = 1; |
2930 | want_refresh = 1; |
2873 | free (selection.text); |
2931 | free (selection.text); |
2874 | selection.text = NULL; |
2932 | selection.text = NULL; |
2875 | selection.len = 0; |
2933 | selection.len = 0; |
… | |
… | |
2924 | |
2982 | |
2925 | int end_col; |
2983 | int end_col; |
2926 | |
2984 | |
2927 | for (; row <= selection.end.row; row++, col = 0) |
2985 | for (; row <= selection.end.row; row++, col = 0) |
2928 | { |
2986 | { |
2929 | #if ENABLE_FRILLS |
2987 | #if !ENABLE_MINIMAL |
2930 | if (selection.rect) |
2988 | if (selection.rect) |
2931 | { |
2989 | { |
2932 | col = selection.beg.col; |
2990 | col = selection.beg.col; |
2933 | end_col = ncol + 1; |
2991 | end_col = ncol + 1; |
2934 | } |
2992 | } |
… | |
… | |
2937 | end_col = ROW(row).l; |
2995 | end_col = ROW(row).l; |
2938 | |
2996 | |
2939 | col = max (col, 0); |
2997 | col = max (col, 0); |
2940 | |
2998 | |
2941 | if (row == selection.end.row |
2999 | if (row == selection.end.row |
2942 | #if ENABLE_FRILLS |
3000 | #if !ENABLE_MINIMAL |
2943 | || selection.rect |
3001 | || selection.rect |
2944 | #endif |
3002 | #endif |
2945 | ) |
3003 | ) |
2946 | min_it (end_col, selection.end.col); |
3004 | min_it (end_col, selection.end.col); |
2947 | |
3005 | |
… | |
… | |
2970 | #endif |
3028 | #endif |
2971 | else |
3029 | else |
2972 | new_selection_text[ofs++] = *t++; |
3030 | new_selection_text[ofs++] = *t++; |
2973 | } |
3031 | } |
2974 | |
3032 | |
2975 | #if ENABLE_FRILLS |
3033 | #if !ENABLE_MINIMAL |
2976 | if (selection.rect) |
3034 | if (selection.rect) |
2977 | { |
3035 | { |
2978 | while (ofs |
3036 | while (ofs |
2979 | && new_selection_text[ofs - 1] != C0_LF |
3037 | && new_selection_text[ofs - 1] != C0_LF |
2980 | && unicode::is_space (new_selection_text[ofs - 1])) |
3038 | && unicode::is_space (new_selection_text[ofs - 1])) |
… | |
… | |
3010 | |
3068 | |
3011 | selection_grab (tm); |
3069 | selection_grab (tm); |
3012 | } |
3070 | } |
3013 | |
3071 | |
3014 | bool |
3072 | bool |
3015 | rxvt_term::selection_grab (Time tm) |
3073 | rxvt_term::selection_grab (Time tm) NOTHROW |
3016 | { |
3074 | { |
3017 | selection_time = tm; |
3075 | selection_time = tm; |
3018 | |
3076 | |
3019 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
3077 | XSetSelectionOwner (dpy, XA_PRIMARY, vt, tm); |
3020 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
3078 | if (XGetSelectionOwner (dpy, XA_PRIMARY) == vt) |
3021 | { |
3079 | { |
3022 | display->set_selection_owner (this); |
3080 | display->set_selection_owner (this); |
3023 | return true; |
3081 | return true; |
3024 | } |
3082 | } |
3025 | else |
3083 | else |
… | |
… | |
3029 | } |
3087 | } |
3030 | |
3088 | |
3031 | #if 0 |
3089 | #if 0 |
3032 | XTextProperty ct; |
3090 | XTextProperty ct; |
3033 | |
3091 | |
3034 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3092 | if (XwcTextListToTextProperty (dpy, &selection.text, 1, XStringStyle, &ct) >= 0) |
3035 | { |
3093 | { |
3036 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3094 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3037 | XFree (ct.value); |
3095 | XFree (ct.value); |
3038 | } |
3096 | } |
3039 | #endif |
3097 | #endif |
… | |
… | |
3043 | /* |
3101 | /* |
3044 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
3102 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
3045 | * EXT: button 1 press |
3103 | * EXT: button 1 press |
3046 | */ |
3104 | */ |
3047 | void |
3105 | void |
3048 | rxvt_term::selection_click (int clicks, int x, int y) |
3106 | rxvt_term::selection_click (int clicks, int x, int y) NOTHROW |
3049 | { |
3107 | { |
3050 | clicks = ((clicks - 1) % 3) + 1; |
3108 | clicks = ((clicks - 1) % 3) + 1; |
3051 | selection.clicks = clicks; /* save clicks so extend will work */ |
3109 | selection.clicks = clicks; /* save clicks so extend will work */ |
3052 | |
3110 | |
3053 | if (clicks == 2 && !selection.rect |
3111 | if (clicks == 2 && !selection.rect |
… | |
… | |
3072 | /* ------------------------------------------------------------------------- */ |
3130 | /* ------------------------------------------------------------------------- */ |
3073 | /* |
3131 | /* |
3074 | * Mark a selection at the specified col/row |
3132 | * Mark a selection at the specified col/row |
3075 | */ |
3133 | */ |
3076 | void |
3134 | void |
3077 | rxvt_term::selection_start_colrow (int col, int row) |
3135 | rxvt_term::selection_start_colrow (int col, int row) NOTHROW |
3078 | { |
3136 | { |
3079 | want_refresh = 1; |
3137 | want_refresh = 1; |
3080 | |
3138 | |
3081 | selection.mark.row = row + view_start; |
3139 | selection.mark.row = row + view_start; |
3082 | selection.mark.col = col; |
3140 | selection.mark.col = col; |
… | |
… | |
3085 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3143 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3086 | |
3144 | |
3087 | while (selection.mark.col > 0 |
3145 | while (selection.mark.col > 0 |
3088 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3146 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3089 | --selection.mark.col; |
3147 | --selection.mark.col; |
3090 | |
3148 | |
3091 | if (selection.op) |
3149 | if (selection.op) |
|
|
3150 | { |
3092 | { /* clear the old selection */ |
3151 | /* clear the old selection */ |
3093 | selection.beg.row = selection.end.row = selection.mark.row; |
3152 | selection.beg.row = selection.end.row = selection.mark.row; |
3094 | selection.beg.col = selection.end.col = selection.mark.col; |
3153 | selection.beg.col = selection.end.col = selection.mark.col; |
3095 | } |
3154 | } |
3096 | |
3155 | |
3097 | selection.op = SELECTION_INIT; |
3156 | selection.op = SELECTION_INIT; |
… | |
… | |
3108 | #define DELIMIT_TEXT(x) \ |
3167 | #define DELIMIT_TEXT(x) \ |
3109 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
3168 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
3110 | #define DELIMIT_REND(x) 1 |
3169 | #define DELIMIT_REND(x) 1 |
3111 | |
3170 | |
3112 | void |
3171 | void |
3113 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) |
3172 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW |
3114 | { |
3173 | { |
3115 | int col, row, dirnadd, tcol, trow, w1, w2; |
3174 | int col, row, dirnadd, tcol, trow, w1, w2; |
3116 | row_col_t bound; |
3175 | row_col_t bound; |
3117 | text_t *stp; |
3176 | text_t *stp; |
3118 | rend_t *srp; |
3177 | rend_t *srp; |
… | |
… | |
3192 | * flag == 0 ==> button 1 |
3251 | * flag == 0 ==> button 1 |
3193 | * flag == 1 ==> button 3 press |
3252 | * flag == 1 ==> button 3 press |
3194 | * flag == 2 ==> button 3 motion |
3253 | * flag == 2 ==> button 3 motion |
3195 | */ |
3254 | */ |
3196 | void |
3255 | void |
3197 | rxvt_term::selection_extend (int x, int y, int flag) |
3256 | rxvt_term::selection_extend (int x, int y, int flag) NOTHROW |
3198 | { |
3257 | { |
3199 | int col = clamp (Pixel2Col (x), 0, ncol); |
3258 | int col = clamp (Pixel2Col (x), 0, ncol); |
3200 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3259 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3201 | |
3260 | |
3202 | /* |
3261 | /* |
… | |
… | |
3228 | /* ------------------------------------------------------------------------- */ |
3287 | /* ------------------------------------------------------------------------- */ |
3229 | /* |
3288 | /* |
3230 | * Extend the selection to the specified col/row |
3289 | * Extend the selection to the specified col/row |
3231 | */ |
3290 | */ |
3232 | void |
3291 | void |
3233 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) |
3292 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW |
3234 | { |
3293 | { |
3235 | row_col_t pos; |
3294 | row_col_t pos; |
3236 | enum { |
3295 | enum { |
3237 | LEFT, RIGHT |
3296 | LEFT, RIGHT |
3238 | } closeto = RIGHT; |
3297 | } closeto = RIGHT; |
… | |
… | |
3286 | * a point/word/line which is either the start or end of the selection |
3345 | * a point/word/line which is either the start or end of the selection |
3287 | * and it was decided by whichever point/word/line was `fixed' at the |
3346 | * and it was decided by whichever point/word/line was `fixed' at the |
3288 | * time of the most recent button3 press |
3347 | * time of the most recent button3 press |
3289 | */ |
3348 | */ |
3290 | if (button3 && buttonpress) |
3349 | if (button3 && buttonpress) |
|
|
3350 | { |
3291 | { /* button3 press */ |
3351 | /* button3 press */ |
3292 | /* |
3352 | /* |
3293 | * first determine which edge of the selection we are closest to |
3353 | * first determine which edge of the selection we are closest to |
3294 | */ |
3354 | */ |
3295 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3355 | if (ROWCOL_IS_BEFORE (pos, selection.beg) |
3296 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
3356 | || (!ROWCOL_IS_AFTER (pos, selection.end) |
… | |
… | |
3314 | selection.mark.row = selection.beg.row; |
3374 | selection.mark.row = selection.beg.row; |
3315 | selection.mark.col = selection.beg.col; |
3375 | selection.mark.col = selection.beg.col; |
3316 | } |
3376 | } |
3317 | } |
3377 | } |
3318 | else |
3378 | else |
|
|
3379 | { |
3319 | { /* button1 drag or button3 drag */ |
3380 | /* button1 drag or button3 drag */ |
3320 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3381 | if (ROWCOL_IS_AFTER (selection.mark, pos)) |
3321 | { |
3382 | { |
3322 | if (selection.mark.row == selection.end.row |
3383 | if (selection.mark.row == selection.end.row |
3323 | && selection.mark.col == selection.end.col |
3384 | && selection.mark.col == selection.end.col |
3324 | && clickchange |
3385 | && clickchange |
… | |
… | |
3341 | |
3402 | |
3342 | if (selection.clicks == 1) |
3403 | if (selection.clicks == 1) |
3343 | { |
3404 | { |
3344 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3405 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3345 | && !ROW(selection.beg.row).is_longer () |
3406 | && !ROW(selection.beg.row).is_longer () |
3346 | #if ENABLE_FRILLS |
3407 | #if !ENABLE_MINIMAL |
3347 | && !selection.rect |
3408 | && !selection.rect |
3348 | #endif |
3409 | #endif |
3349 | ) |
3410 | ) |
3350 | selection.beg.col = ncol; |
3411 | selection.beg.col = ncol; |
3351 | |
3412 | |
3352 | if ( |
3413 | if ( |
3353 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3414 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3354 | && !ROW(selection.end.row).is_longer () |
3415 | && !ROW(selection.end.row).is_longer () |
3355 | #if ENABLE_FRILLS |
3416 | #if !ENABLE_MINIMAL |
3356 | && !selection.rect |
3417 | && !selection.rect |
3357 | #endif |
3418 | #endif |
3358 | ) |
3419 | ) |
3359 | selection.end.col = ncol; |
3420 | selection.end.col = ncol; |
3360 | } |
3421 | } |
… | |
… | |
3367 | selection_delimit_word (DN, &selection.end, &selection.end); |
3428 | selection_delimit_word (DN, &selection.end, &selection.end); |
3368 | } |
3429 | } |
3369 | else if (selection.clicks == 3) |
3430 | else if (selection.clicks == 3) |
3370 | { |
3431 | { |
3371 | #if ENABLE_FRILLS |
3432 | #if ENABLE_FRILLS |
3372 | if (OPTION (Opt_tripleclickwords)) |
3433 | if (option (Opt_tripleclickwords)) |
3373 | { |
3434 | { |
3374 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3435 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3375 | |
3436 | |
3376 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3437 | for (int end_row = selection.mark.row; end_row < nrow; end_row++) |
3377 | { |
3438 | { |
3378 | if (!ROW(end_row).is_longer ()) |
3439 | if (!ROW(end_row).is_longer ()) |
3379 | { |
3440 | { |
3380 | selection.end.row = end_row; |
3441 | selection.end.row = end_row; |
3381 | selection.end.col = ROW(end_row).l; |
3442 | selection.end.col = ROW(end_row).l; |
|
|
3443 | # if !ENABLE_MINIMAL |
3382 | selection_remove_trailing_spaces (); |
3444 | selection_remove_trailing_spaces (); |
|
|
3445 | # endif |
3383 | break; |
3446 | break; |
3384 | } |
3447 | } |
3385 | } |
3448 | } |
3386 | } |
3449 | } |
3387 | else |
3450 | else |
… | |
… | |
3403 | selection.end.row++; |
3466 | selection.end.row++; |
3404 | } |
3467 | } |
3405 | } |
3468 | } |
3406 | |
3469 | |
3407 | if (button3 && buttonpress) |
3470 | if (button3 && buttonpress) |
|
|
3471 | { |
3408 | { /* mark may need to be changed */ |
3472 | /* mark may need to be changed */ |
3409 | if (closeto == LEFT) |
3473 | if (closeto == LEFT) |
3410 | { |
3474 | { |
3411 | selection.mark.row = selection.end.row; |
3475 | selection.mark.row = selection.end.row; |
3412 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3476 | selection.mark.col = selection.end.col - (selection.clicks == 2); |
3413 | } |
3477 | } |
… | |
… | |
3416 | selection.mark.row = selection.beg.row; |
3480 | selection.mark.row = selection.beg.row; |
3417 | selection.mark.col = selection.beg.col; |
3481 | selection.mark.col = selection.beg.col; |
3418 | } |
3482 | } |
3419 | } |
3483 | } |
3420 | |
3484 | |
3421 | #if ENABLE_FRILLS |
3485 | #if !ENABLE_MINIMAL |
3422 | if (selection.rect && selection.beg.col > selection.end.col) |
3486 | if (selection.rect && selection.beg.col > selection.end.col) |
3423 | ::swap (selection.beg.col, selection.end.col); |
3487 | ::swap (selection.beg.col, selection.end.col); |
3424 | #endif |
3488 | #endif |
3425 | } |
3489 | } |
3426 | |
3490 | |
3427 | #if ENABLE_FRILLS |
3491 | #if !ENABLE_MINIMAL |
3428 | void |
3492 | void |
3429 | rxvt_term::selection_remove_trailing_spaces () |
3493 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3430 | { |
3494 | { |
3431 | int32_t end_col, end_row; |
3495 | int32_t end_col, end_row; |
3432 | text_t *stp; |
3496 | text_t *stp; |
3433 | |
3497 | |
3434 | end_col = selection.end.col; |
3498 | end_col = selection.end.col; |
… | |
… | |
3472 | /* |
3536 | /* |
3473 | * Double click on button 3 when already selected |
3537 | * Double click on button 3 when already selected |
3474 | * EXT: button 3 double click |
3538 | * EXT: button 3 double click |
3475 | */ |
3539 | */ |
3476 | void |
3540 | void |
3477 | rxvt_term::selection_rotate (int x, int y) |
3541 | rxvt_term::selection_rotate (int x, int y) NOTHROW |
3478 | { |
3542 | { |
3479 | selection.clicks = selection.clicks % 3 + 1; |
3543 | selection.clicks = selection.clicks % 3 + 1; |
3480 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3544 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3481 | } |
3545 | } |
3482 | |
3546 | |
… | |
… | |
3484 | /* |
3548 | /* |
3485 | * Respond to a request for our current selection |
3549 | * Respond to a request for our current selection |
3486 | * EXT: SelectionRequest |
3550 | * EXT: SelectionRequest |
3487 | */ |
3551 | */ |
3488 | void |
3552 | void |
3489 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) |
3553 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3490 | { |
3554 | { |
3491 | XSelectionEvent ev; |
3555 | XSelectionEvent ev; |
3492 | dDisp; |
|
|
3493 | |
3556 | |
3494 | ev.type = SelectionNotify; |
3557 | ev.type = SelectionNotify; |
3495 | ev.property = None; |
3558 | ev.property = None; |
3496 | ev.display = rq.display; |
3559 | ev.display = rq.display; |
3497 | ev.requestor = rq.requestor; |
3560 | ev.requestor = rq.requestor; |
… | |
… | |
3511 | *target++ = xa[XA_COMPOUND_TEXT]; |
3574 | *target++ = xa[XA_COMPOUND_TEXT]; |
3512 | #if X_HAVE_UTF8_STRING |
3575 | #if X_HAVE_UTF8_STRING |
3513 | *target++ = xa[XA_UTF8_STRING]; |
3576 | *target++ = xa[XA_UTF8_STRING]; |
3514 | #endif |
3577 | #endif |
3515 | |
3578 | |
3516 | XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, |
3579 | XChangeProperty (dpy, rq.requestor, rq.property, XA_ATOM, |
3517 | 32, PropModeReplace, |
3580 | 32, PropModeReplace, |
3518 | (unsigned char *)target_list, target - target_list); |
3581 | (unsigned char *)target_list, target - target_list); |
3519 | ev.property = rq.property; |
3582 | ev.property = rq.property; |
3520 | } |
3583 | } |
3521 | #if TODO // TODO |
3584 | #if TODO // TODO |
… | |
… | |
3524 | /* TODO: Handle MULTIPLE */ |
3587 | /* TODO: Handle MULTIPLE */ |
3525 | } |
3588 | } |
3526 | #endif |
3589 | #endif |
3527 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3590 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3528 | { |
3591 | { |
3529 | XChangeProperty (disp, rq.requestor, rq.property, rq.target, |
3592 | XChangeProperty (dpy, rq.requestor, rq.property, rq.target, |
3530 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3593 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3531 | ev.property = rq.property; |
3594 | ev.property = rq.property; |
3532 | } |
3595 | } |
3533 | else if (rq.target == XA_STRING |
3596 | else if (rq.target == XA_STRING |
3534 | || rq.target == xa[XA_TEXT] |
3597 | || rq.target == xa[XA_TEXT] |
… | |
… | |
3558 | style = enc_string; |
3621 | style = enc_string; |
3559 | else if (target == xa[XA_TEXT]) |
3622 | else if (target == xa[XA_TEXT]) |
3560 | style = enc_text; |
3623 | style = enc_text; |
3561 | else if (target == xa[XA_COMPOUND_TEXT]) |
3624 | else if (target == xa[XA_COMPOUND_TEXT]) |
3562 | style = enc_compound_text; |
3625 | style = enc_compound_text; |
3563 | #if ENABLE_FRILLS |
3626 | #if !ENABLE_MINIMAL |
3564 | else if (target == xa[XA_UTF8_STRING]) |
3627 | else if (target == xa[XA_UTF8_STRING]) |
3565 | style = enc_utf8; |
3628 | style = enc_utf8; |
3566 | #endif |
3629 | #endif |
3567 | else |
3630 | else |
3568 | { |
3631 | { |
… | |
… | |
3579 | { |
3642 | { |
3580 | cl = L""; |
3643 | cl = L""; |
3581 | selectlen = 0; |
3644 | selectlen = 0; |
3582 | } |
3645 | } |
3583 | |
3646 | |
3584 | #if ENABLE_FRILLS |
3647 | #if !ENABLE_MINIMAL |
3585 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3648 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3586 | // so recode it manually |
3649 | // so recode it manually |
3587 | if (style == enc_utf8) |
3650 | if (style == enc_utf8) |
3588 | { |
3651 | { |
3589 | freect = 1; |
3652 | freect = 1; |
… | |
… | |
3592 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3655 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3593 | ct.nitems = strlen ((char *)ct.value); |
3656 | ct.nitems = strlen ((char *)ct.value); |
3594 | } |
3657 | } |
3595 | else |
3658 | else |
3596 | #endif |
3659 | #endif |
3597 | if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3660 | if (XwcTextListToTextProperty (dpy, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3598 | freect = 1; |
3661 | freect = 1; |
3599 | else |
3662 | else |
3600 | { |
3663 | { |
3601 | /* if we failed to convert then send it raw */ |
3664 | /* if we failed to convert then send it raw */ |
3602 | ct.value = (unsigned char *)cl; |
3665 | ct.value = (unsigned char *)cl; |
3603 | ct.nitems = selectlen; |
3666 | ct.nitems = selectlen; |
3604 | ct.encoding = target; |
3667 | ct.encoding = target; |
3605 | } |
3668 | } |
3606 | |
3669 | |
3607 | XChangeProperty (disp, rq.requestor, rq.property, |
3670 | XChangeProperty (dpy, rq.requestor, rq.property, |
3608 | ct.encoding, 8, PropModeReplace, |
3671 | ct.encoding, 8, PropModeReplace, |
3609 | ct.value, (int)ct.nitems); |
3672 | ct.value, (int)ct.nitems); |
3610 | ev.property = rq.property; |
3673 | ev.property = rq.property; |
3611 | |
3674 | |
3612 | if (freect) |
3675 | if (freect) |
3613 | XFree (ct.value); |
3676 | XFree (ct.value); |
3614 | } |
3677 | } |
3615 | |
3678 | |
3616 | XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); |
3679 | XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev); |
3617 | } |
|
|
3618 | |
|
|
3619 | /* ------------------------------------------------------------------------- * |
|
|
3620 | * MOUSE ROUTINES * |
|
|
3621 | * ------------------------------------------------------------------------- */ |
|
|
3622 | |
|
|
3623 | /* |
|
|
3624 | * return col/row values corresponding to x/y pixel values |
|
|
3625 | */ |
|
|
3626 | void |
|
|
3627 | rxvt_term::pixel_position (int *x, int *y) |
|
|
3628 | { |
|
|
3629 | *x = Pixel2Col (*x); |
|
|
3630 | /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ |
|
|
3631 | *y = Pixel2Row (*y); |
|
|
3632 | /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ |
|
|
3633 | } |
3680 | } |
3634 | |
3681 | |
3635 | /* ------------------------------------------------------------------------- */ |
3682 | /* ------------------------------------------------------------------------- */ |
3636 | #ifdef USE_XIM |
3683 | #ifdef USE_XIM |
3637 | void |
3684 | void |
3638 | rxvt_term::im_set_position (XPoint &pos) |
3685 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3639 | { |
3686 | { |
3640 | XWindowAttributes xwa; |
3687 | XWindowAttributes xwa; |
3641 | |
3688 | |
3642 | XGetWindowAttributes (display->display, vt, &xwa); |
3689 | XGetWindowAttributes (dpy, vt, &xwa); |
3643 | |
3690 | |
3644 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3691 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3645 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3692 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3646 | } |
3693 | } |
3647 | #endif |
3694 | #endif |
3648 | |
3695 | |
3649 | #if ENABLE_OVERLAY |
3696 | #if ENABLE_OVERLAY |
3650 | void |
3697 | void |
3651 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
3698 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW |
3652 | { |
3699 | { |
3653 | if (nrow < 1 || ncol < 1) |
3700 | if (nrow < 1 || ncol < 1) |
3654 | return; |
3701 | return; |
3655 | |
3702 | |
3656 | want_refresh = 1; |
3703 | want_refresh = 1; |
… | |
… | |
3701 | *rp = r; |
3748 | *rp = r; |
3702 | } |
3749 | } |
3703 | } |
3750 | } |
3704 | |
3751 | |
3705 | void |
3752 | void |
3706 | rxvt_term::scr_overlay_off () |
3753 | rxvt_term::scr_overlay_off () NOTHROW |
3707 | { |
3754 | { |
3708 | if (!ov_text) |
3755 | if (!ov_text) |
3709 | return; |
3756 | return; |
3710 | |
3757 | |
3711 | want_refresh = 1; |
3758 | want_refresh = 1; |
… | |
… | |
3719 | delete [] ov_text; ov_text = 0; |
3766 | delete [] ov_text; ov_text = 0; |
3720 | delete [] ov_rend; ov_rend = 0; |
3767 | delete [] ov_rend; ov_rend = 0; |
3721 | } |
3768 | } |
3722 | |
3769 | |
3723 | void |
3770 | void |
3724 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) |
3771 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3725 | { |
3772 | { |
3726 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3773 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3727 | return; |
3774 | return; |
3728 | |
3775 | |
3729 | x++, y++; |
3776 | x++, y++; |
… | |
… | |
3731 | ov_text[y][x] = text; |
3778 | ov_text[y][x] = text; |
3732 | ov_rend[y][x] = rend; |
3779 | ov_rend[y][x] = rend; |
3733 | } |
3780 | } |
3734 | |
3781 | |
3735 | void |
3782 | void |
3736 | rxvt_term::scr_overlay_set (int x, int y, const char *s) |
3783 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3737 | { |
3784 | { |
3738 | while (*s) |
3785 | while (*s) |
3739 | scr_overlay_set (x++, y, *s++); |
3786 | scr_overlay_set (x++, y, *s++); |
3740 | } |
3787 | } |
3741 | |
3788 | |
3742 | void |
3789 | void |
3743 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) |
3790 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW |
3744 | { |
3791 | { |
3745 | while (*s) |
3792 | while (*s) |
3746 | { |
3793 | { |
3747 | text_t t = *s++; |
3794 | text_t t = *s++; |
3748 | int width = wcwidth (t); |
3795 | int width = WCWIDTH (t); |
3749 | |
3796 | |
3750 | while (width--) |
3797 | while (width--) |
3751 | { |
3798 | { |
3752 | scr_overlay_set (x++, y, t); |
3799 | scr_overlay_set (x++, y, t); |
3753 | t = NOCHAR; |
3800 | t = NOCHAR; |
3754 | } |
3801 | } |
3755 | } |
3802 | } |
3756 | } |
3803 | } |
3757 | |
3804 | |
3758 | void |
3805 | void |
3759 | rxvt_term::scr_swap_overlay () |
3806 | rxvt_term::scr_swap_overlay () NOTHROW |
3760 | { |
3807 | { |
3761 | if (!ov_text) |
3808 | if (!ov_text) |
3762 | return; |
3809 | return; |
3763 | |
3810 | |
3764 | // swap screen mem with overlay |
3811 | // swap screen mem with overlay |