… | |
… | |
93 | */ |
93 | */ |
94 | #define drawBuffer vt |
94 | #define drawBuffer vt |
95 | |
95 | |
96 | #define CLEAR_ROWS(row, num) \ |
96 | #define CLEAR_ROWS(row, num) \ |
97 | if (mapped) \ |
97 | if (mapped) \ |
98 | XClearArea (display->display, drawBuffer, 0, \ |
98 | XClearArea (xdisp, drawBuffer, 0, \ |
99 | Row2Pixel (row), (unsigned int)width, \ |
99 | Row2Pixel (row), (unsigned int)width, \ |
100 | (unsigned int)Height2Pixel (num), False) |
100 | (unsigned int)Height2Pixel (num), False) |
101 | |
101 | |
102 | #define CLEAR_CHARS(x, y, num) \ |
102 | #define CLEAR_CHARS(x, y, num) \ |
103 | if (mapped) \ |
103 | if (mapped) \ |
104 | XClearArea (display->display, drawBuffer, x, y, \ |
104 | XClearArea (xdisp, drawBuffer, x, y, \ |
105 | (unsigned int)Width2Pixel (num), \ |
105 | (unsigned int)Width2Pixel (num), \ |
106 | (unsigned int)Height2Pixel (1), False) |
106 | (unsigned int)Height2Pixel (1), False) |
107 | |
107 | |
108 | #define ERASE_ROWS(row, num) \ |
108 | #define ERASE_ROWS(row, num) \ |
109 | XFillRectangle (display->display, drawBuffer, gc, \ |
109 | XFillRectangle (xdisp, drawBuffer, gc, \ |
110 | 0, Row2Pixel (row), \ |
110 | 0, Row2Pixel (row), \ |
111 | (unsigned int)width, \ |
111 | (unsigned int)width, \ |
112 | (unsigned int)Height2Pixel (num)) |
112 | (unsigned int)Height2Pixel (num)) |
113 | |
113 | |
114 | /* ------------------------------------------------------------------------- * |
114 | /* ------------------------------------------------------------------------- * |
115 | * SCREEN `COMMON' ROUTINES * |
115 | * SCREEN `COMMON' ROUTINES * |
116 | * ------------------------------------------------------------------------- */ |
116 | * ------------------------------------------------------------------------- */ |
117 | |
117 | |
118 | /* Fill part/all of a line with blanks. */ |
118 | /* Fill part/all of a line with blanks. */ |
119 | void |
119 | void |
120 | rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) |
120 | rxvt_term::scr_blank_line (line_t &l, unsigned int col, unsigned int width, rend_t efs) const NOTHROW |
121 | { |
121 | { |
122 | if (!l.t) |
122 | if (!l.t) |
123 | { |
123 | { |
124 | lalloc (l); |
124 | lalloc (l); |
125 | col = 0; |
125 | col = 0; |
126 | width = ncol; |
126 | width = ncol; |
127 | } |
127 | } |
128 | |
128 | |
129 | l.touch (); |
129 | l.touch (); |
130 | |
130 | |
131 | efs &= ~RS_baseattrMask; |
131 | efs &= ~RS_baseattrMask; // remove italic etc. fontstyles |
132 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
132 | efs = SET_FONT (efs, FONTSET (efs)->find_font (' ')); |
133 | |
133 | |
134 | text_t *et = l.t + col; |
134 | text_t *et = l.t + col; |
135 | rend_t *er = l.r + col; |
135 | rend_t *er = l.r + col; |
136 | |
136 | |
… | |
… | |
142 | } |
142 | } |
143 | |
143 | |
144 | /* ------------------------------------------------------------------------- */ |
144 | /* ------------------------------------------------------------------------- */ |
145 | /* Fill a full line with blanks - make sure it is allocated first */ |
145 | /* Fill a full line with blanks - make sure it is allocated first */ |
146 | void |
146 | void |
147 | rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) |
147 | rxvt_term::scr_blank_screen_mem (line_t &l, rend_t efs) const NOTHROW |
148 | { |
148 | { |
149 | scr_blank_line (l, 0, ncol, efs); |
149 | scr_blank_line (l, 0, ncol, efs); |
|
|
150 | |
|
|
151 | l.l = 0; |
|
|
152 | l.f = 0; |
150 | } |
153 | } |
151 | |
154 | |
152 | /* ------------------------------------------------------------------------- * |
155 | /* ------------------------------------------------------------------------- * |
153 | * SCREEN INITIALISATION * |
156 | * SCREEN INITIALISATION * |
154 | * ------------------------------------------------------------------------- */ |
157 | * ------------------------------------------------------------------------- */ |
… | |
… | |
170 | nrow = 24; |
173 | nrow = 24; |
171 | |
174 | |
172 | if (ncol == prev_ncol && nrow == prev_nrow) |
175 | if (ncol == prev_ncol && nrow == prev_nrow) |
173 | return; |
176 | return; |
174 | |
177 | |
|
|
178 | if (current_screen != PRIMARY) |
|
|
179 | scr_swap_screen (); |
|
|
180 | |
175 | // we need at least two lines for wrapping to work correctly |
181 | // we need at least two lines for wrapping to work correctly |
176 | if (nrow + saveLines < 2) |
182 | while (nrow + saveLines < 2) |
177 | { |
183 | { |
178 | //TODO//FIXME |
184 | //TODO//FIXME |
179 | saveLines++; |
185 | saveLines++; |
180 | prev_nrow--; |
186 | prev_nrow--; |
181 | nsaved++; |
187 | top_row--; |
182 | } |
188 | } |
183 | |
189 | |
184 | want_refresh = 1; |
190 | want_refresh = 1; |
185 | |
191 | |
186 | int prev_total_rows = prev_nrow + saveLines; |
192 | int prev_total_rows = prev_nrow + saveLines; |
… | |
… | |
191 | |
197 | |
192 | if (!row_buf) |
198 | if (!row_buf) |
193 | { |
199 | { |
194 | /* |
200 | /* |
195 | * first time called so just malloc everything: don't rely on realloc |
201 | * first time called so just malloc everything: don't rely on realloc |
196 | * Note: this is still needed so that all the scrollback lines are NULL |
|
|
197 | */ |
202 | */ |
198 | nsaved = 0; /* no saved lines */ |
203 | top_row = 0; |
199 | term_start = 0; |
204 | term_start = 0; |
200 | |
205 | |
201 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
206 | talloc = new rxvt_salloc (ncol * sizeof (text_t)); |
202 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
207 | ralloc = new rxvt_salloc (ncol * sizeof (rend_t)); |
203 | |
208 | |
204 | row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
209 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
205 | temp_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
|
|
206 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
210 | drawn_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
207 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
211 | swap_buf = (line_t *)rxvt_calloc (nrow , sizeof (line_t)); |
208 | |
212 | |
209 | for (int row = nrow; row--; ) |
213 | for (int row = nrow; row--; ) |
210 | { |
214 | { |
211 | scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); |
215 | scr_blank_screen_mem (ROW (row), DEFAULT_RSTYLE); |
212 | scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
216 | scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
… | |
… | |
233 | selection.text = NULL; |
237 | selection.text = NULL; |
234 | selection.len = 0; |
238 | selection.len = 0; |
235 | selection.op = SELECTION_CLEAR; |
239 | selection.op = SELECTION_CLEAR; |
236 | selection.screen = PRIMARY; |
240 | selection.screen = PRIMARY; |
237 | selection.clicks = 0; |
241 | selection.clicks = 0; |
238 | CLEAR_ALL_SELECTION (); |
242 | rvideo_state = rvideo_mode = false; |
239 | rvideo = 0; |
|
|
240 | } |
243 | } |
241 | else |
244 | else |
242 | { |
245 | { |
243 | /* |
246 | /* |
244 | * add or delete rows as appropriate |
247 | * add or delete rows as appropriate |
… | |
… | |
257 | } |
260 | } |
258 | } |
261 | } |
259 | #endif |
262 | #endif |
260 | |
263 | |
261 | drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); |
264 | drawn_buf = (line_t *)rxvt_realloc (drawn_buf, nrow * sizeof (line_t)); |
262 | temp_buf = (line_t *)rxvt_realloc (temp_buf , nrow * sizeof (line_t)); |
|
|
263 | swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); |
265 | swap_buf = (line_t *)rxvt_realloc (swap_buf , nrow * sizeof (line_t)); |
264 | |
266 | |
265 | for (int row = min (nrow, prev_nrow); row--; ) |
267 | for (int row = min (nrow, prev_nrow); row--; ) |
266 | { |
268 | { |
267 | lresize (drawn_buf[row]); |
269 | lresize (drawn_buf[row]); |
… | |
… | |
272 | { |
274 | { |
273 | swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
275 | swap_buf [row].clear (); scr_blank_screen_mem (swap_buf [row], DEFAULT_RSTYLE); |
274 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
276 | drawn_buf[row].clear (); scr_blank_screen_mem (drawn_buf[row], DEFAULT_RSTYLE); |
275 | } |
277 | } |
276 | |
278 | |
|
|
279 | line_t *old_buf = row_buf; |
277 | line_t *old_buf = row_buf; row_buf = (line_t *)rxvt_calloc (total_rows, sizeof (line_t)); |
280 | row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t)); |
278 | |
281 | |
279 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
282 | int p = MOD (term_start + prev_nrow, prev_total_rows); // previous row |
280 | int pend = MOD (term_start - nsaved , prev_total_rows); |
283 | int pend = MOD (term_start + top_row , prev_total_rows); |
281 | int q = total_rows; // rewrapped row |
284 | int q = total_rows; // rewrapped row |
282 | |
285 | |
283 | if (nsaved) |
286 | if (top_row) |
284 | { |
287 | { |
285 | // re-wrap lines, this is rather ugly, possibly because I am too dumb |
288 | // Re-wrap lines. This is rather ugly, possibly because I am too dumb |
286 | // to come up with a lean and mean algorithm. |
289 | // to come up with a lean and mean algorithm. |
287 | |
290 | |
288 | row_col_t ocur = screen.cur; |
291 | row_col_t ocur = screen.cur; |
289 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
292 | ocur.row = MOD (term_start + ocur.row, prev_total_rows); |
290 | |
293 | |
… | |
… | |
324 | qline->l = ncol; |
327 | qline->l = ncol; |
325 | qline->is_longer (1); |
328 | qline->is_longer (1); |
326 | |
329 | |
327 | int qcol = 0; |
330 | int qcol = 0; |
328 | |
331 | |
|
|
332 | // see below for cursor adjustment rationale |
|
|
333 | if (p == ocur.row) |
|
|
334 | screen.cur.row = q - (total_rows - nrow); |
|
|
335 | |
329 | // fill a single destination line |
336 | // fill a single destination line |
330 | while (lofs < llen && qcol < ncol) |
337 | while (lofs < llen && qcol < ncol) |
331 | { |
338 | { |
332 | int prow = lofs / prev_ncol; |
339 | int prow = lofs / prev_ncol; |
333 | int pcol = lofs % prev_ncol; |
340 | int pcol = lofs % prev_ncol; |
… | |
… | |
343 | |
350 | |
344 | line_t &pline = old_buf [prow]; |
351 | line_t &pline = old_buf [prow]; |
345 | |
352 | |
346 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
353 | int len = min (min (prev_ncol - pcol, ncol - qcol), llen - lofs); |
347 | |
354 | |
348 | assert (len); |
|
|
349 | assert (pline.t); |
|
|
350 | |
|
|
351 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
355 | memcpy (qline->t + qcol, pline.t + pcol, len * sizeof (text_t)); |
352 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
356 | memcpy (qline->r + qcol, pline.r + pcol, len * sizeof (rend_t)); |
353 | |
357 | |
354 | lofs += len; |
358 | lofs += len; |
355 | qcol += len; |
359 | qcol += len; |
… | |
… | |
361 | scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); |
365 | scr_blank_line (*qline, qline->l, ncol - qline->l, DEFAULT_RSTYLE); |
362 | } |
366 | } |
363 | while (p != pend && q > 0); |
367 | while (p != pend && q > 0); |
364 | |
368 | |
365 | term_start = total_rows - nrow; |
369 | term_start = total_rows - nrow; |
366 | nsaved = term_start - q; |
370 | top_row = q - term_start; |
367 | |
371 | |
368 | // make sure all terminal lines exist |
372 | // make sure all terminal lines exist |
369 | while (nsaved < 0) |
373 | while (top_row > 0) |
370 | scr_blank_screen_mem (ROW (-++nsaved), DEFAULT_RSTYLE); |
374 | scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE); |
371 | } |
375 | } |
372 | else |
376 | else |
373 | { |
377 | { |
374 | // if no scrollback exists (yet), wing, instead of wrap |
378 | // if no scrollback exists (yet), wing, instead of wrap |
375 | |
379 | |
… | |
… | |
388 | } |
392 | } |
389 | |
393 | |
390 | term_start = 0; |
394 | term_start = 0; |
391 | } |
395 | } |
392 | |
396 | |
393 | #ifdef DEBUG_STRICT //TODO: remove |
|
|
394 | for (int i = -nsaved; i < nrow; i++) |
|
|
395 | assert (ROW (i).t); |
|
|
396 | #endif |
|
|
397 | |
|
|
398 | free (old_buf); |
397 | free (old_buf); |
399 | delete old_ta; |
398 | delete old_ta; |
400 | delete old_ra; |
399 | delete old_ra; |
401 | |
400 | |
402 | clamp_it (screen.cur.row, 0, nrow - 1); |
401 | clamp_it (screen.cur.row, 0, nrow - 1); |
403 | clamp_it (screen.cur.col, 0, ncol - 1); |
402 | clamp_it (screen.cur.col, 0, ncol - 1); |
404 | |
403 | |
405 | if (tabs) |
|
|
406 | free (tabs); |
404 | free (tabs); |
407 | } |
405 | } |
|
|
406 | |
|
|
407 | CLEAR_ALL_SELECTION (); |
408 | |
408 | |
409 | prev_nrow = nrow; |
409 | prev_nrow = nrow; |
410 | prev_ncol = ncol; |
410 | prev_ncol = ncol; |
411 | |
411 | |
412 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
412 | tabs = (char *)rxvt_malloc (ncol * sizeof (char)); |
413 | |
413 | |
414 | for (int col = ncol; col--; ) |
414 | for (int col = ncol; col--; ) |
415 | tabs [col] = col % TABSIZE == 0; |
415 | tabs [col] = col % TABSIZE == 0; |
416 | |
416 | |
|
|
417 | if (current_screen != PRIMARY) |
|
|
418 | scr_swap_screen (); |
|
|
419 | |
417 | tt_winch (); |
420 | tt_winch (); |
418 | |
421 | |
419 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
422 | HOOK_INVOKE ((this, HOOK_RESET, DT_END)); |
420 | } |
423 | } |
421 | |
424 | |
422 | /* ------------------------------------------------------------------------- */ |
425 | /* ------------------------------------------------------------------------- */ |
423 | /* |
426 | /* |
424 | * Free everything. That way malloc debugging can find leakage. |
427 | * Free everything. That way malloc debugging can find leakage. |
425 | */ |
428 | */ |
426 | void |
429 | void |
427 | rxvt_term::scr_release () |
430 | rxvt_term::scr_release () NOTHROW |
428 | { |
431 | { |
|
|
432 | if (row_buf) |
|
|
433 | { |
429 | delete talloc; talloc = 0; |
434 | delete talloc; talloc = 0; |
430 | delete ralloc; ralloc = 0; |
435 | delete ralloc; ralloc = 0; |
431 | |
436 | |
432 | free (row_buf); |
437 | free (row_buf); |
433 | free (swap_buf); |
438 | free (swap_buf); |
434 | free (drawn_buf); |
439 | free (drawn_buf); |
435 | free (temp_buf); |
|
|
436 | free (tabs); |
440 | free (tabs); |
437 | |
441 | |
438 | row_buf = 0; // signal that we freed all the arrays |
442 | row_buf = 0; // signal that we freed all the arrays |
|
|
443 | } |
439 | } |
444 | } |
440 | |
445 | |
441 | /* ------------------------------------------------------------------------- */ |
446 | /* ------------------------------------------------------------------------- */ |
442 | /* |
447 | /* |
443 | * Hard reset |
448 | * Hard reset |
… | |
… | |
448 | scr_release (); |
453 | scr_release (); |
449 | prev_nrow = prev_ncol = 0; |
454 | prev_nrow = prev_ncol = 0; |
450 | scr_reset (); |
455 | scr_reset (); |
451 | |
456 | |
452 | scr_clear (true); |
457 | scr_clear (true); |
453 | scr_refresh (SLOW_REFRESH); |
458 | scr_refresh (); |
454 | } |
459 | } |
455 | |
460 | |
456 | /* ------------------------------------------------------------------------- * |
461 | /* ------------------------------------------------------------------------- * |
457 | * PROCESS SCREEN COMMANDS * |
462 | * PROCESS SCREEN COMMANDS * |
458 | * ------------------------------------------------------------------------- */ |
463 | * ------------------------------------------------------------------------- */ |
… | |
… | |
460 | * Save and Restore cursor |
465 | * Save and Restore cursor |
461 | * XTERM_SEQ: Save cursor : ESC 7 |
466 | * XTERM_SEQ: Save cursor : ESC 7 |
462 | * XTERM_SEQ: Restore cursor: ESC 8 |
467 | * XTERM_SEQ: Restore cursor: ESC 8 |
463 | */ |
468 | */ |
464 | void |
469 | void |
465 | rxvt_term::scr_cursor (int mode) |
470 | rxvt_term::scr_cursor (cursor_mode mode) NOTHROW |
466 | { |
471 | { |
467 | screen_t *s; |
472 | screen_t *s; |
468 | |
473 | |
469 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
474 | #if NSCREENS && !defined(NO_SECONDARY_SCREEN_CURSOR) |
470 | if (current_screen == SECONDARY) |
475 | if (current_screen == SECONDARY) |
… | |
… | |
502 | assert (s->cur.row >= 0); |
507 | assert (s->cur.row >= 0); |
503 | assert (s->cur.col >= 0); |
508 | assert (s->cur.col >= 0); |
504 | #endif |
509 | #endif |
505 | } |
510 | } |
506 | |
511 | |
|
|
512 | void |
|
|
513 | rxvt_term::scr_swap_screen () |
|
|
514 | { |
|
|
515 | if (!OPTION (Opt_secondaryScreen)) |
|
|
516 | return; |
|
|
517 | |
|
|
518 | for (int i = prev_nrow; i--; ) |
|
|
519 | ::swap (ROW(i), swap_buf [i]); |
|
|
520 | |
|
|
521 | ::swap (screen.cur, swap.cur); |
|
|
522 | |
|
|
523 | screen.cur.row = clamp (screen.cur.row, 0, prev_nrow - 1); |
|
|
524 | screen.cur.col = clamp (screen.cur.col, 0, prev_ncol - 1); |
|
|
525 | } |
|
|
526 | |
507 | /* ------------------------------------------------------------------------- */ |
527 | /* ------------------------------------------------------------------------- */ |
508 | /* |
528 | /* |
509 | * Swap between primary and secondary screens |
529 | * Swap between primary and secondary screens |
510 | * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h |
530 | * XTERM_SEQ: Primary screen : ESC [ ? 4 7 h |
511 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
531 | * XTERM_SEQ: Secondary screen: ESC [ ? 4 7 l |
512 | */ |
532 | */ |
513 | int |
533 | void |
514 | rxvt_term::scr_change_screen (int scrn) |
534 | rxvt_term::scr_change_screen (int scrn) |
515 | { |
535 | { |
|
|
536 | if (scrn == current_screen) |
|
|
537 | return; |
|
|
538 | |
516 | want_refresh = 1; |
539 | want_refresh = 1; |
517 | view_start = 0; |
540 | view_start = 0; |
518 | |
541 | |
519 | if (current_screen == scrn) |
|
|
520 | return scrn; |
|
|
521 | |
|
|
522 | selection_check (2); /* check for boundary cross */ |
542 | selection_check (2); /* check for boundary cross */ |
523 | |
543 | |
524 | int i = current_screen; current_screen = scrn; scrn = i; |
544 | int i = current_screen; current_screen = scrn; scrn = i; |
525 | |
|
|
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 | |
545 | |
532 | #if NSCREENS |
546 | #if NSCREENS |
533 | if (OPTION (Opt_secondaryScreen)) |
547 | if (OPTION (Opt_secondaryScreen)) |
534 | { |
548 | { |
535 | num_scr = 0; |
549 | num_scr = 0; |
536 | |
550 | |
537 | for (int i = prev_nrow; i--; ) |
551 | scr_swap_screen (); |
538 | ::swap (ROW(i), swap_buf [i]); |
|
|
539 | |
552 | |
540 | ::swap (screen.charset, swap.charset); |
553 | ::swap (screen.charset, swap.charset); |
541 | ::swap (screen.flags, swap.flags); |
554 | ::swap (screen.flags, swap.flags); |
542 | screen.flags |= Screen_VisibleCursor; |
555 | screen.flags |= Screen_VisibleCursor; |
543 | swap.flags |= Screen_VisibleCursor; |
556 | swap.flags |= Screen_VisibleCursor; |
544 | } |
557 | } |
545 | else |
558 | else |
546 | #endif |
559 | #endif |
547 | if (OPTION (Opt_secondaryScroll)) |
560 | if (OPTION (Opt_secondaryScroll)) |
548 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
561 | scr_scroll_text (0, prev_nrow - 1, prev_nrow); |
549 | |
|
|
550 | return scrn; |
|
|
551 | } |
562 | } |
552 | |
563 | |
553 | // clear WrapNext indicator, solidifying position on next line |
564 | // clear WrapNext indicator, solidifying position on next line |
554 | void |
565 | void |
555 | rxvt_term::scr_do_wrap () |
566 | rxvt_term::scr_do_wrap () NOTHROW |
556 | { |
567 | { |
557 | if (!(screen.flags & Screen_WrapNext)) |
568 | if (!(screen.flags & Screen_WrapNext)) |
558 | return; |
569 | return; |
559 | |
570 | |
560 | screen.flags &= ~Screen_WrapNext; |
571 | screen.flags &= ~Screen_WrapNext; |
… | |
… | |
570 | /* ------------------------------------------------------------------------- */ |
581 | /* ------------------------------------------------------------------------- */ |
571 | /* |
582 | /* |
572 | * Change the colour for following text |
583 | * Change the colour for following text |
573 | */ |
584 | */ |
574 | void |
585 | void |
575 | rxvt_term::scr_color (unsigned int color, int fgbg) |
586 | rxvt_term::scr_color (unsigned int color, int fgbg) NOTHROW |
576 | { |
587 | { |
577 | if (color > maxTermCOLOR) |
588 | if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) |
578 | color = fgbg; |
589 | color = fgbg; |
579 | |
590 | |
580 | if (fgbg == Color_fg) |
591 | if (fgbg == Color_fg) |
581 | rstyle = SET_FGCOLOR (rstyle, color); |
592 | rstyle = SET_FGCOLOR (rstyle, color); |
582 | else |
593 | else |
… | |
… | |
586 | /* ------------------------------------------------------------------------- */ |
597 | /* ------------------------------------------------------------------------- */ |
587 | /* |
598 | /* |
588 | * Change the rendition style for following text |
599 | * Change the rendition style for following text |
589 | */ |
600 | */ |
590 | void |
601 | void |
591 | rxvt_term::scr_rendition (int set, int style) |
602 | rxvt_term::scr_rendition (int set, int style) NOTHROW |
592 | { |
603 | { |
593 | if (set) |
604 | if (set) |
594 | rstyle |= style; |
605 | rstyle |= style; |
595 | else if (style == ~RS_None) |
606 | else if (style == ~RS_None) |
596 | rstyle = DEFAULT_RSTYLE; |
607 | rstyle = DEFAULT_RSTYLE; |
… | |
… | |
603 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
614 | * Scroll text between <row1> and <row2> inclusive, by <count> lines |
604 | * count positive ==> scroll up |
615 | * count positive ==> scroll up |
605 | * count negative ==> scroll down |
616 | * count negative ==> scroll down |
606 | */ |
617 | */ |
607 | int |
618 | int |
608 | rxvt_term::scr_scroll_text (int row1, int row2, int count) |
619 | rxvt_term::scr_scroll_text (int row1, int row2, int count) NOTHROW |
609 | { |
620 | { |
610 | if (count == 0 || (row1 > row2)) |
621 | if (count == 0 || (row1 > row2)) |
611 | return 0; |
622 | return 0; |
612 | |
623 | |
613 | want_refresh = 1; |
624 | want_refresh = 1; |
614 | num_scr += count; |
625 | num_scr += count; |
615 | |
626 | |
616 | if (count > 0 |
627 | if (count > 0 |
617 | && row1 == 0 |
628 | && row1 == 0 |
618 | && row2 == nrow - 1 |
|
|
619 | && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) |
629 | && (current_screen == PRIMARY || OPTION (Opt_secondaryScroll))) |
620 | { |
630 | { |
621 | nsaved = min (nsaved + count, saveLines); |
631 | top_row = max (top_row - count, -saveLines); |
622 | |
632 | |
623 | HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, nsaved, DT_END)); |
633 | // scroll everything up 'count' lines |
|
|
634 | term_start = (term_start + count) % total_rows; |
|
|
635 | |
|
|
636 | // sever bottommost line |
|
|
637 | { |
|
|
638 | line_t &l = ROW(row2 - count); |
|
|
639 | l.is_longer (0); |
|
|
640 | l.touch (); |
|
|
641 | } |
|
|
642 | |
|
|
643 | // erase newly scrolled-in lines |
|
|
644 | for (int i = count; i--; ) |
|
|
645 | { |
|
|
646 | line_t &l = ROW(nrow - 1 - i); |
|
|
647 | |
|
|
648 | // optimize if already cleared, can be significant on slow machines |
|
|
649 | // could be rolled into scr_blank_screen_mem |
|
|
650 | if (l.r && l.l < ncol - 1 && !((l.r[l.l + 1] ^ rstyle) & RS_bgMask)) |
|
|
651 | { |
|
|
652 | scr_blank_line (l, 0, l.l, rstyle); |
|
|
653 | l.l = 0; |
|
|
654 | l.f = 0; |
|
|
655 | } |
|
|
656 | else |
|
|
657 | scr_blank_screen_mem (l, rstyle); |
|
|
658 | } |
|
|
659 | |
|
|
660 | // now copy lines below the scroll region bottom to the |
|
|
661 | // bottom of the screen again, so they look as if they |
|
|
662 | // hadn't moved. |
|
|
663 | for (int i = nrow; --i > row2; ) |
|
|
664 | { |
|
|
665 | line_t &l1 = ROW(i - count); |
|
|
666 | line_t &l2 = ROW(i); |
|
|
667 | |
|
|
668 | ::swap (l1, l2); |
|
|
669 | l2.touch (); |
|
|
670 | } |
624 | |
671 | |
625 | term_start = (term_start + count) % total_rows; |
672 | // move and/or clear selection, if any |
626 | |
|
|
627 | if (selection.op && current_screen == selection.screen) |
673 | if (selection.op && current_screen == selection.screen) |
628 | { |
674 | { |
629 | selection.beg.row -= count; |
675 | selection.beg.row -= count; |
630 | selection.end.row -= count; |
676 | selection.end.row -= count; |
631 | selection.mark.row -= count; |
677 | selection.mark.row -= count; |
632 | |
678 | |
633 | if (selection.beg.row < -nsaved |
679 | if (selection.beg.row < top_row |
634 | || selection.end.row < -nsaved |
680 | || selection.end.row < top_row |
635 | || selection.mark.row < -nsaved) |
681 | || selection.mark.row < top_row) |
636 | { |
682 | { |
637 | CLEAR_ALL_SELECTION (); |
683 | CLEAR_ALL_SELECTION (); |
638 | selection.op = SELECTION_CLEAR; |
684 | selection.op = SELECTION_CLEAR; |
639 | } |
685 | } |
640 | } |
686 | } |
641 | |
687 | |
642 | for (int i = count; i--; ) |
688 | // finally move the view window, if desired |
643 | { |
|
|
644 | ROW(row2 - i).l = 0; |
|
|
645 | scr_blank_screen_mem (ROW(row2 - i), rstyle); |
|
|
646 | } |
|
|
647 | |
|
|
648 | if (OPTION (Opt_scrollWithBuffer) |
689 | if (OPTION (Opt_scrollWithBuffer) |
649 | && view_start != 0 |
690 | && view_start != 0 |
650 | && view_start != saveLines) |
691 | && view_start != -saveLines) |
651 | scr_page (UP, count); |
692 | scr_page (UP, count); |
|
|
693 | |
|
|
694 | if (SHOULD_INVOKE (HOOK_SCROLL_BACK)) |
|
|
695 | HOOK_INVOKE ((this, HOOK_SCROLL_BACK, DT_INT, count, DT_INT, top_row, DT_END)); |
652 | } |
696 | } |
653 | else |
697 | else |
654 | { |
698 | { |
655 | if (selection.op && current_screen == selection.screen) |
699 | if (selection.op && current_screen == selection.screen) |
656 | { |
700 | { |
… | |
… | |
680 | |
724 | |
681 | int rows = row2 - row1 + 1; |
725 | int rows = row2 - row1 + 1; |
682 | |
726 | |
683 | min_it (count, rows); |
727 | min_it (count, rows); |
684 | |
728 | |
|
|
729 | line_t *temp_buf = row_buf + total_rows; |
|
|
730 | |
685 | for (int row = 0; row < rows; row++) |
731 | for (int row = 0; row < rows; row++) |
686 | { |
732 | { |
687 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
733 | temp_buf [row] = ROW(row1 + (row + count + rows) % rows); |
688 | |
734 | |
689 | if (!IN_RANGE_EXC (row + count, 0, rows)) |
735 | if (!IN_RANGE_EXC (row + count, 0, rows)) |
… | |
… | |
700 | /* ------------------------------------------------------------------------- */ |
746 | /* ------------------------------------------------------------------------- */ |
701 | /* |
747 | /* |
702 | * Add text given in <str> of length <len> to screen struct |
748 | * Add text given in <str> of length <len> to screen struct |
703 | */ |
749 | */ |
704 | void |
750 | void |
705 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) |
751 | rxvt_term::scr_add_lines (const wchar_t *str, int len, int minlines) NOTHROW |
706 | { |
752 | { |
707 | if (len <= 0) /* sanity */ |
753 | if (len <= 0) /* sanity */ |
708 | return; |
754 | return; |
709 | |
755 | |
710 | unsigned char checksel; |
756 | unsigned char checksel; |
… | |
… | |
716 | ZERO_SCROLLBACK (); |
762 | ZERO_SCROLLBACK (); |
717 | |
763 | |
718 | if (minlines > 0) |
764 | if (minlines > 0) |
719 | { |
765 | { |
720 | minlines += screen.cur.row - screen.bscroll; |
766 | minlines += screen.cur.row - screen.bscroll; |
|
|
767 | min_it (minlines, screen.cur.row - top_row); |
721 | |
768 | |
722 | if (minlines > 0 |
769 | if (minlines > 0 |
723 | && screen.tscroll == 0 |
770 | && screen.tscroll == 0 |
724 | && screen.bscroll == nrow - 1) |
771 | && screen.bscroll == nrow - 1) |
725 | { |
772 | { |
… | |
… | |
730 | } |
777 | } |
731 | |
778 | |
732 | #ifdef DEBUG_STRICT |
779 | #ifdef DEBUG_STRICT |
733 | assert (screen.cur.col < ncol); |
780 | assert (screen.cur.col < ncol); |
734 | assert (screen.cur.row < nrow |
781 | assert (screen.cur.row < nrow |
735 | && screen.cur.row >= -nsaved); |
782 | && screen.cur.row >= top_row); |
736 | #endif |
783 | #endif |
737 | int row = screen.cur.row; |
784 | int row = screen.cur.row; |
738 | |
785 | |
739 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
786 | checksel = selection.op && current_screen == selection.screen ? 1 : 0; |
740 | |
787 | |
… | |
… | |
786 | CLEAR_SELECTION (); |
833 | CLEAR_SELECTION (); |
787 | } |
834 | } |
788 | |
835 | |
789 | if (screen.flags & Screen_WrapNext) |
836 | if (screen.flags & Screen_WrapNext) |
790 | { |
837 | { |
791 | max_it (line->l, ncol); |
|
|
792 | line->is_longer (1); |
|
|
793 | |
|
|
794 | scr_do_wrap (); |
838 | scr_do_wrap (); |
795 | |
839 | |
|
|
840 | line->l = ncol; |
|
|
841 | line->is_longer (1); |
|
|
842 | |
796 | row = screen.cur.row; |
843 | row = screen.cur.row; |
797 | line = &ROW(row); /* _must_ refresh */ |
844 | line = &ROW(row); /* _must_ refresh */ |
798 | } |
845 | } |
799 | |
846 | |
800 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
847 | // some utf-8 decoders "decode" surrogate characters: let's fix this. |
801 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
848 | if (IN_RANGE_INC (c, 0xd800, 0xdfff)) |
802 | c = 0xfffd; |
849 | c = 0xfffd; |
803 | |
850 | |
804 | // rely on wcwidth to tell us the character width, at least for non-latin1 |
851 | // rely on wcwidth to tell us the character width, do wcwidth before |
805 | // do wcwidth before further replacements, as wcwidth might return -1 |
852 | // further replacements, as wcwidth might return -1 for the line |
806 | // for the line drawing characters below as they might be invalid in the current |
853 | // drawing characters below as they might be invalid in the current |
807 | // locale. |
854 | // locale. |
808 | int width = c < 0x100 ? 1 : wcwidth (c); |
855 | int width = WCWIDTH (c); |
809 | |
856 | |
810 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
857 | if (charsets [screen.charset] == '0') // DEC SPECIAL |
811 | { |
858 | { |
812 | // vt100 special graphics and line drawing |
859 | // vt100 special graphics and line drawing |
813 | // 5f-7e standard vt100 |
860 | // 5f-7e standard vt100 |
… | |
… | |
964 | /* |
1011 | /* |
965 | * Process Backspace. Move back the cursor back a position, wrap if have to |
1012 | * Process Backspace. Move back the cursor back a position, wrap if have to |
966 | * XTERM_SEQ: CTRL-H |
1013 | * XTERM_SEQ: CTRL-H |
967 | */ |
1014 | */ |
968 | void |
1015 | void |
969 | rxvt_term::scr_backspace () |
1016 | rxvt_term::scr_backspace () NOTHROW |
970 | { |
1017 | { |
971 | want_refresh = 1; |
1018 | want_refresh = 1; |
972 | |
1019 | |
973 | if (screen.cur.col == 0) |
1020 | if (screen.cur.col == 0) |
974 | { |
1021 | { |
… | |
… | |
992 | * Process Horizontal Tab |
1039 | * Process Horizontal Tab |
993 | * count: +ve = forward; -ve = backwards |
1040 | * count: +ve = forward; -ve = backwards |
994 | * XTERM_SEQ: CTRL-I |
1041 | * XTERM_SEQ: CTRL-I |
995 | */ |
1042 | */ |
996 | void |
1043 | void |
997 | rxvt_term::scr_tab (int count, bool ht) |
1044 | rxvt_term::scr_tab (int count, bool ht) NOTHROW |
998 | { |
1045 | { |
999 | int i, x; |
1046 | int i, x; |
1000 | |
1047 | |
1001 | want_refresh = 1; |
1048 | want_refresh = 1; |
1002 | i = x = screen.cur.col; |
1049 | i = x = screen.cur.col; |
… | |
… | |
1067 | * Process DEC Back Index |
1114 | * Process DEC Back Index |
1068 | * XTERM_SEQ: ESC 6 |
1115 | * XTERM_SEQ: ESC 6 |
1069 | * Move cursor left in row. If we're at the left boundary, shift everything |
1116 | * Move cursor left in row. If we're at the left boundary, shift everything |
1070 | * in that row right. Clear left column. |
1117 | * in that row right. Clear left column. |
1071 | */ |
1118 | */ |
1072 | #if ENABLE_FRILLS |
1119 | #if !ENABLE_MINIMAL |
1073 | void |
1120 | void |
1074 | rxvt_term::scr_backindex () |
1121 | rxvt_term::scr_backindex () NOTHROW |
1075 | { |
1122 | { |
1076 | if (screen.cur.col > 0) |
1123 | if (screen.cur.col > 0) |
1077 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1124 | scr_gotorc (0, -1, R_RELATIVE | C_RELATIVE); |
1078 | else |
1125 | else |
1079 | scr_insdel_chars (1, INSERT); |
1126 | scr_insdel_chars (1, INSERT); |
… | |
… | |
1084 | * Process DEC Forward Index |
1131 | * Process DEC Forward Index |
1085 | * XTERM_SEQ: ESC 9 |
1132 | * XTERM_SEQ: ESC 9 |
1086 | * Move cursor right in row. If we're at the right boundary, shift everything |
1133 | * Move cursor right in row. If we're at the right boundary, shift everything |
1087 | * in that row left. Clear right column. |
1134 | * in that row left. Clear right column. |
1088 | */ |
1135 | */ |
1089 | #if ENABLE_FRILLS |
1136 | #if !ENABLE_MINIMAL |
1090 | void |
1137 | void |
1091 | rxvt_term::scr_forwardindex () |
1138 | rxvt_term::scr_forwardindex () NOTHROW |
1092 | { |
1139 | { |
1093 | if (screen.cur.col < ncol - 1) |
1140 | if (screen.cur.col < ncol - 1) |
1094 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1141 | scr_gotorc (0, 1, R_RELATIVE | C_RELATIVE); |
1095 | else |
1142 | else |
1096 | { |
1143 | { |
… | |
… | |
1109 | /* ------------------------------------------------------------------------- */ |
1156 | /* ------------------------------------------------------------------------- */ |
1110 | /* |
1157 | /* |
1111 | * Goto Row/Column |
1158 | * Goto Row/Column |
1112 | */ |
1159 | */ |
1113 | void |
1160 | void |
1114 | rxvt_term::scr_gotorc (int row, int col, int relative) |
1161 | rxvt_term::scr_gotorc (int row, int col, int relative) NOTHROW |
1115 | { |
1162 | { |
1116 | want_refresh = 1; |
1163 | want_refresh = 1; |
1117 | ZERO_SCROLLBACK (); |
1164 | ZERO_SCROLLBACK (); |
1118 | |
1165 | |
1119 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
1166 | screen.cur.col = relative & C_RELATIVE ? screen.cur.col + col : col; |
… | |
… | |
1157 | /* ------------------------------------------------------------------------- */ |
1204 | /* ------------------------------------------------------------------------- */ |
1158 | /* |
1205 | /* |
1159 | * direction should be UP or DN |
1206 | * direction should be UP or DN |
1160 | */ |
1207 | */ |
1161 | void |
1208 | void |
1162 | rxvt_term::scr_index (enum page_dirn direction) |
1209 | rxvt_term::scr_index (enum page_dirn direction) NOTHROW |
1163 | { |
1210 | { |
1164 | int dirn; |
1211 | int dirn; |
1165 | |
1212 | |
1166 | want_refresh = 1; |
1213 | want_refresh = 1; |
1167 | ZERO_SCROLLBACK (); |
1214 | ZERO_SCROLLBACK (); |
… | |
… | |
1186 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1233 | * XTERM_SEQ: Clear line to right: ESC [ 0 K |
1187 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1234 | * XTERM_SEQ: Clear line to left : ESC [ 1 K |
1188 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1235 | * XTERM_SEQ: Clear whole line : ESC [ 2 K |
1189 | */ |
1236 | */ |
1190 | void |
1237 | void |
1191 | rxvt_term::scr_erase_line (int mode) |
1238 | rxvt_term::scr_erase_line (int mode) NOTHROW |
1192 | { |
1239 | { |
1193 | unsigned int col, num; |
1240 | unsigned int col, num; |
1194 | |
1241 | |
1195 | want_refresh = 1; |
1242 | want_refresh = 1; |
1196 | ZERO_SCROLLBACK (); |
1243 | ZERO_SCROLLBACK (); |
… | |
… | |
1240 | * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J |
1287 | * XTERM_SEQ: Clear screen after cursor : ESC [ 0 J |
1241 | * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J |
1288 | * XTERM_SEQ: Clear screen before cursor: ESC [ 1 J |
1242 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1289 | * XTERM_SEQ: Clear whole screen : ESC [ 2 J |
1243 | */ |
1290 | */ |
1244 | void |
1291 | void |
1245 | rxvt_term::scr_erase_screen (int mode) |
1292 | rxvt_term::scr_erase_screen (int mode) NOTHROW |
1246 | { |
1293 | { |
1247 | int num; |
1294 | int num; |
1248 | int32_t row; |
1295 | int32_t row; |
1249 | rend_t ren; |
1296 | rend_t ren; |
1250 | XGCValues gcvalue; |
1297 | XGCValues gcvalue; |
… | |
… | |
1295 | } |
1342 | } |
1296 | else |
1343 | else |
1297 | { |
1344 | { |
1298 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1345 | ren = rstyle & (RS_fgMask | RS_bgMask); |
1299 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1346 | gcvalue.foreground = pix_colors[bgcolor_of (rstyle)]; |
1300 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1347 | XChangeGC (xdisp, gc, GCForeground, &gcvalue); |
1301 | ERASE_ROWS (row, num); |
1348 | ERASE_ROWS (row, num); |
1302 | gcvalue.foreground = pix_colors[Color_fg]; |
1349 | gcvalue.foreground = pix_colors[Color_fg]; |
1303 | XChangeGC (display->display, gc, GCForeground, &gcvalue); |
1350 | XChangeGC (xdisp, gc, GCForeground, &gcvalue); |
1304 | } |
1351 | } |
1305 | |
1352 | |
1306 | for (; num--; row++) |
1353 | for (; num--; row++) |
1307 | { |
1354 | { |
1308 | line_t &l = ROW(row); |
|
|
1309 | l.l = 0; |
|
|
1310 | l.is_longer (0); |
|
|
1311 | scr_blank_screen_mem (l, rstyle); |
1355 | scr_blank_screen_mem (ROW(row), rstyle); |
1312 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1356 | scr_blank_line (drawn_buf [row], 0, ncol, ren); |
1313 | } |
1357 | } |
1314 | } |
1358 | } |
1315 | |
1359 | |
1316 | #if ENABLE_FRILLS |
1360 | #if !ENABLE_MINIMAL |
1317 | void |
1361 | void |
1318 | rxvt_term::scr_erase_savelines () |
1362 | rxvt_term::scr_erase_savelines () NOTHROW |
1319 | { |
1363 | { |
1320 | want_refresh = 1; |
1364 | want_refresh = 1; |
1321 | ZERO_SCROLLBACK (); |
1365 | ZERO_SCROLLBACK (); |
1322 | |
1366 | |
1323 | nsaved = 0; |
1367 | top_row = 0; |
1324 | } |
1368 | } |
1325 | #endif |
1369 | #endif |
1326 | |
1370 | |
1327 | /* ------------------------------------------------------------------------- */ |
1371 | /* ------------------------------------------------------------------------- */ |
1328 | /* |
1372 | /* |
1329 | * Fill the screen with `E's |
1373 | * Fill the screen with `E's |
1330 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1374 | * XTERM_SEQ: Screen Alignment Test: ESC # 8 |
1331 | */ |
1375 | */ |
1332 | void |
1376 | void |
1333 | rxvt_term::scr_E () |
1377 | rxvt_term::scr_E () NOTHROW |
1334 | { |
1378 | { |
1335 | rend_t fs; |
1379 | rend_t fs; |
1336 | |
1380 | |
1337 | want_refresh = 1; |
1381 | want_refresh = 1; |
1338 | ZERO_SCROLLBACK (); |
1382 | ZERO_SCROLLBACK (); |
… | |
… | |
1359 | /* ------------------------------------------------------------------------- */ |
1403 | /* ------------------------------------------------------------------------- */ |
1360 | /* |
1404 | /* |
1361 | * Insert/Delete <count> lines |
1405 | * Insert/Delete <count> lines |
1362 | */ |
1406 | */ |
1363 | void |
1407 | void |
1364 | rxvt_term::scr_insdel_lines (int count, int insdel) |
1408 | rxvt_term::scr_insdel_lines (int count, int insdel) NOTHROW |
1365 | { |
1409 | { |
1366 | int end; |
1410 | int end; |
1367 | |
1411 | |
1368 | ZERO_SCROLLBACK (); |
1412 | ZERO_SCROLLBACK (); |
1369 | |
1413 | |
… | |
… | |
1389 | /* ------------------------------------------------------------------------- */ |
1433 | /* ------------------------------------------------------------------------- */ |
1390 | /* |
1434 | /* |
1391 | * Insert/Delete <count> characters from the current position |
1435 | * Insert/Delete <count> characters from the current position |
1392 | */ |
1436 | */ |
1393 | void |
1437 | void |
1394 | rxvt_term::scr_insdel_chars (int count, int insdel) |
1438 | rxvt_term::scr_insdel_chars (int count, int insdel) NOTHROW |
1395 | { |
1439 | { |
1396 | int col, row; |
1440 | int col, row; |
1397 | rend_t tr; |
1441 | rend_t tr; |
1398 | |
1442 | |
1399 | want_refresh = 1; |
1443 | want_refresh = 1; |
… | |
… | |
1487 | /* |
1531 | /* |
1488 | * Set the scrolling region |
1532 | * Set the scrolling region |
1489 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1533 | * XTERM_SEQ: Set region <top> - <bot> inclusive: ESC [ <top> ; <bot> r |
1490 | */ |
1534 | */ |
1491 | void |
1535 | void |
1492 | rxvt_term::scr_scroll_region (int top, int bot) |
1536 | rxvt_term::scr_scroll_region (int top, int bot) NOTHROW |
1493 | { |
1537 | { |
1494 | max_it (top, 0); |
1538 | max_it (top, 0); |
1495 | min_it (bot, nrow - 1); |
1539 | min_it (bot, nrow - 1); |
1496 | |
1540 | |
1497 | if (top > bot) |
1541 | if (top > bot) |
… | |
… | |
1507 | * Make the cursor visible/invisible |
1551 | * Make the cursor visible/invisible |
1508 | * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h |
1552 | * XTERM_SEQ: Make cursor visible : ESC [ ? 25 h |
1509 | * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l |
1553 | * XTERM_SEQ: Make cursor invisible: ESC [ ? 25 l |
1510 | */ |
1554 | */ |
1511 | void |
1555 | void |
1512 | rxvt_term::scr_cursor_visible (int mode) |
1556 | rxvt_term::scr_cursor_visible (int mode) NOTHROW |
1513 | { |
1557 | { |
1514 | want_refresh = 1; |
1558 | want_refresh = 1; |
1515 | |
1559 | |
1516 | if (mode) |
1560 | if (mode) |
1517 | screen.flags |= Screen_VisibleCursor; |
1561 | screen.flags |= Screen_VisibleCursor; |
… | |
… | |
1524 | * Set/unset automatic wrapping |
1568 | * Set/unset automatic wrapping |
1525 | * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h |
1569 | * XTERM_SEQ: Set Wraparound : ESC [ ? 7 h |
1526 | * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l |
1570 | * XTERM_SEQ: Unset Wraparound: ESC [ ? 7 l |
1527 | */ |
1571 | */ |
1528 | void |
1572 | void |
1529 | rxvt_term::scr_autowrap (int mode) |
1573 | rxvt_term::scr_autowrap (int mode) NOTHROW |
1530 | { |
1574 | { |
1531 | if (mode) |
1575 | if (mode) |
1532 | screen.flags |= Screen_Autowrap; |
1576 | screen.flags |= Screen_Autowrap; |
1533 | else |
1577 | else |
1534 | screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); |
1578 | screen.flags &= ~(Screen_Autowrap | Screen_WrapNext); |
… | |
… | |
1543 | * and the cursor cannot be moved outside. |
1587 | * and the cursor cannot be moved outside. |
1544 | * XTERM_SEQ: Set Absolute: ESC [ ? 6 h |
1588 | * XTERM_SEQ: Set Absolute: ESC [ ? 6 h |
1545 | * XTERM_SEQ: Set Relative: ESC [ ? 6 l |
1589 | * XTERM_SEQ: Set Relative: ESC [ ? 6 l |
1546 | */ |
1590 | */ |
1547 | void |
1591 | void |
1548 | rxvt_term::scr_relative_origin (int mode) |
1592 | rxvt_term::scr_relative_origin (int mode) NOTHROW |
1549 | { |
1593 | { |
1550 | if (mode) |
1594 | if (mode) |
1551 | screen.flags |= Screen_Relative; |
1595 | screen.flags |= Screen_Relative; |
1552 | else |
1596 | else |
1553 | screen.flags &= ~Screen_Relative; |
1597 | screen.flags &= ~Screen_Relative; |
… | |
… | |
1560 | * Set insert/replace mode |
1604 | * Set insert/replace mode |
1561 | * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h |
1605 | * XTERM_SEQ: Set Insert mode : ESC [ ? 4 h |
1562 | * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l |
1606 | * XTERM_SEQ: Set Replace mode: ESC [ ? 4 l |
1563 | */ |
1607 | */ |
1564 | void |
1608 | void |
1565 | rxvt_term::scr_insert_mode (int mode) |
1609 | rxvt_term::scr_insert_mode (int mode) NOTHROW |
1566 | { |
1610 | { |
1567 | if (mode) |
1611 | if (mode) |
1568 | screen.flags |= Screen_Insert; |
1612 | screen.flags |= Screen_Insert; |
1569 | else |
1613 | else |
1570 | screen.flags &= ~Screen_Insert; |
1614 | screen.flags &= ~Screen_Insert; |
… | |
… | |
1576 | * XTERM_SEQ: Set tab at current column : ESC H |
1620 | * XTERM_SEQ: Set tab at current column : ESC H |
1577 | * XTERM_SEQ: Clear tab at current column: ESC [ 0 g |
1621 | * XTERM_SEQ: Clear tab at current column: ESC [ 0 g |
1578 | * XTERM_SEQ: Clear all tabs : ESC [ 3 g |
1622 | * XTERM_SEQ: Clear all tabs : ESC [ 3 g |
1579 | */ |
1623 | */ |
1580 | void |
1624 | void |
1581 | rxvt_term::scr_set_tab (int mode) |
1625 | rxvt_term::scr_set_tab (int mode) NOTHROW |
1582 | { |
1626 | { |
1583 | if (mode < 0) |
1627 | if (mode < 0) |
1584 | memset (tabs, 0, ncol * sizeof (char)); |
1628 | memset (tabs, 0, ncol * sizeof (char)); |
1585 | else if (screen.cur.col < ncol) |
1629 | else if (screen.cur.col < ncol) |
1586 | tabs [screen.cur.col] = !!mode; |
1630 | tabs [screen.cur.col] = !!mode; |
… | |
… | |
1591 | * Set reverse/normal video |
1635 | * Set reverse/normal video |
1592 | * XTERM_SEQ: Reverse video: ESC [ ? 5 h |
1636 | * XTERM_SEQ: Reverse video: ESC [ ? 5 h |
1593 | * XTERM_SEQ: Normal video : ESC [ ? 5 l |
1637 | * XTERM_SEQ: Normal video : ESC [ ? 5 l |
1594 | */ |
1638 | */ |
1595 | void |
1639 | void |
1596 | rxvt_term::scr_rvideo_mode (int mode) |
1640 | rxvt_term::scr_rvideo_mode (bool on) NOTHROW |
1597 | { |
1641 | { |
1598 | XGCValues gcvalue; |
1642 | rvideo_mode = on; |
1599 | |
1643 | |
|
|
1644 | #ifndef NO_BELL |
|
|
1645 | on ^= rvideo_bell; |
|
|
1646 | #endif |
|
|
1647 | |
1600 | if (rvideo != mode) |
1648 | if (rvideo_state != on) |
1601 | { |
1649 | { |
1602 | rvideo = mode; |
1650 | rvideo_state = on; |
|
|
1651 | |
1603 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1652 | ::swap (pix_colors[Color_fg], pix_colors[Color_bg]); |
1604 | #if XPM_BACKGROUND |
1653 | #if XPM_BACKGROUND |
1605 | if (bgPixmap.pixmap == None) |
1654 | if (bgPixmap.pixmap == None) |
1606 | #endif |
1655 | #endif |
1607 | #if TRANSPARENT |
1656 | #if TRANSPARENT |
1608 | if (! OPTION (Opt_transparent) || am_transparent == 0) |
1657 | if (!OPTION (Opt_transparent) || am_transparent == 0) |
1609 | #endif |
1658 | #endif |
1610 | XSetWindowBackground (display->display, vt, |
1659 | XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); |
1611 | pix_colors[Color_bg]); |
|
|
1612 | |
1660 | |
|
|
1661 | XGCValues gcvalue; |
1613 | gcvalue.foreground = pix_colors[Color_fg]; |
1662 | gcvalue.foreground = pix_colors[Color_fg]; |
1614 | gcvalue.background = pix_colors[Color_bg]; |
1663 | gcvalue.background = pix_colors[Color_bg]; |
1615 | XChangeGC (display->display, gc, GCBackground | GCForeground, |
1664 | XChangeGC (xdisp, gc, GCBackground | GCForeground, &gcvalue); |
1616 | &gcvalue); |
1665 | |
1617 | scr_clear (); |
1666 | scr_clear (); |
1618 | scr_touch (true); |
1667 | scr_touch (true); |
1619 | } |
1668 | } |
1620 | } |
1669 | } |
1621 | |
1670 | |
… | |
… | |
1623 | /* |
1672 | /* |
1624 | * Report current cursor position |
1673 | * Report current cursor position |
1625 | * XTERM_SEQ: Report position: ESC [ 6 n |
1674 | * XTERM_SEQ: Report position: ESC [ 6 n |
1626 | */ |
1675 | */ |
1627 | void |
1676 | void |
1628 | rxvt_term::scr_report_position () |
1677 | rxvt_term::scr_report_position () NOTHROW |
1629 | { |
1678 | { |
1630 | tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); |
1679 | tt_printf ("\033[%d;%dR", screen.cur.row + 1, screen.cur.col + 1); |
1631 | } |
1680 | } |
1632 | |
1681 | |
1633 | /* ------------------------------------------------------------------------- * |
1682 | /* ------------------------------------------------------------------------- * |
… | |
… | |
1636 | |
1685 | |
1637 | /* |
1686 | /* |
1638 | * Set font style |
1687 | * Set font style |
1639 | */ |
1688 | */ |
1640 | void |
1689 | void |
1641 | rxvt_term::set_font_style () |
1690 | rxvt_term::set_font_style () NOTHROW |
1642 | { |
1691 | { |
1643 | #if 0 |
1692 | #if 0 |
1644 | switch (charsets [screen.charset]) |
1693 | switch (charsets [screen.charset]) |
1645 | { |
1694 | { |
1646 | case '0': /* DEC Special Character & Line Drawing Set */ |
1695 | case '0': /* DEC Special Character & Line Drawing Set */ |
… | |
… | |
1668 | * XTERM_SEQ: Invoke G1 character set: CTRL-N |
1717 | * XTERM_SEQ: Invoke G1 character set: CTRL-N |
1669 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1718 | * XTERM_SEQ: Invoke G2 character set: ESC N |
1670 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1719 | * XTERM_SEQ: Invoke G3 character set: ESC O |
1671 | */ |
1720 | */ |
1672 | void |
1721 | void |
1673 | rxvt_term::scr_charset_choose (int set) |
1722 | rxvt_term::scr_charset_choose (int set) NOTHROW |
1674 | { |
1723 | { |
1675 | screen.charset = set; |
1724 | screen.charset = set; |
1676 | set_font_style (); |
1725 | set_font_style (); |
1677 | } |
1726 | } |
1678 | |
1727 | |
… | |
… | |
1684 | * XTERM_SEQ: Set G2 character set: ESC * <C> |
1733 | * XTERM_SEQ: Set G2 character set: ESC * <C> |
1685 | * XTERM_SEQ: Set G3 character set: ESC + <C> |
1734 | * XTERM_SEQ: Set G3 character set: ESC + <C> |
1686 | * See set_font_style for possible values for <C> |
1735 | * See set_font_style for possible values for <C> |
1687 | */ |
1736 | */ |
1688 | void |
1737 | void |
1689 | rxvt_term::scr_charset_set (int set, unsigned int ch) |
1738 | rxvt_term::scr_charset_set (int set, unsigned int ch) NOTHROW |
1690 | { |
1739 | { |
1691 | charsets[set] = (unsigned char)ch; |
1740 | charsets[set] = (unsigned char)ch; |
1692 | set_font_style (); |
1741 | set_font_style (); |
1693 | } |
1742 | } |
1694 | |
1743 | |
… | |
… | |
1699 | |
1748 | |
1700 | /* |
1749 | /* |
1701 | * refresh matching text. |
1750 | * refresh matching text. |
1702 | */ |
1751 | */ |
1703 | bool |
1752 | bool |
1704 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) |
1753 | rxvt_term::scr_refresh_rend (rend_t mask, rend_t value) NOTHROW |
1705 | { |
1754 | { |
1706 | bool found = false; |
1755 | bool found = false; |
1707 | |
1756 | |
1708 | for (int i = 0; i < nrow; i++) |
1757 | for (int i = 0; i < nrow; i++) |
1709 | { |
1758 | { |
1710 | int col = 0; |
|
|
1711 | rend_t *drp = drawn_buf[i].r; |
1759 | rend_t *drp = drawn_buf[i].r; |
1712 | |
1760 | |
1713 | for (; col < ncol; col++, drp++) |
1761 | for (int col = 0; col < ncol; col++, drp++) |
1714 | if ((*drp & mask) == value) |
1762 | if ((*drp & mask) == value) |
1715 | { |
1763 | { |
1716 | found = true; |
1764 | found = true; |
1717 | *drp = ~value; |
1765 | *drp = ~value; |
1718 | } |
1766 | } |
… | |
… | |
1729 | PART_END, |
1777 | PART_END, |
1730 | RC_COUNT |
1778 | RC_COUNT |
1731 | }; |
1779 | }; |
1732 | |
1780 | |
1733 | void |
1781 | void |
1734 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) |
1782 | rxvt_term::scr_expose (int x, int y, int ewidth, int eheight, bool refresh) NOTHROW |
1735 | { |
1783 | { |
1736 | int i; |
1784 | int i; |
1737 | row_col_t rc[RC_COUNT]; |
1785 | row_col_t rc[RC_COUNT]; |
1738 | |
1786 | |
1739 | if (!drawn_buf) /* sanity check */ |
1787 | if (!drawn_buf) /* sanity check */ |
… | |
… | |
1762 | } |
1810 | } |
1763 | |
1811 | |
1764 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1812 | for (i = rc[PART_BEG].row; i <= rc[PART_END].row; i++) |
1765 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1813 | fill_text (&drawn_buf[i].t[rc[PART_BEG].col], 0, rc[PART_END].col - rc[PART_BEG].col + 1); |
1766 | |
1814 | |
|
|
1815 | num_scr_allow = 0; |
|
|
1816 | |
1767 | if (refresh) |
1817 | if (refresh) |
1768 | scr_refresh (SLOW_REFRESH); |
1818 | scr_refresh (); |
1769 | } |
1819 | } |
1770 | |
1820 | |
1771 | /* ------------------------------------------------------------------------- */ |
1821 | /* ------------------------------------------------------------------------- */ |
1772 | /* |
1822 | /* |
1773 | * Refresh the entire screen |
1823 | * Refresh the entire screen |
1774 | */ |
1824 | */ |
1775 | void |
1825 | void |
1776 | rxvt_term::scr_touch (bool refresh) |
1826 | rxvt_term::scr_touch (bool refresh) NOTHROW |
1777 | { |
1827 | { |
1778 | scr_expose (0, 0, width, height, refresh); |
1828 | scr_expose (0, 0, width, height, refresh); |
1779 | } |
1829 | } |
1780 | |
1830 | |
1781 | /* ------------------------------------------------------------------------- */ |
1831 | /* ------------------------------------------------------------------------- */ |
1782 | /* |
1832 | /* |
1783 | * Move the display so that the line represented by scrollbar value Y is at |
1833 | * Move the display so that the line represented by scrollbar value Y is at |
1784 | * the top of the screen |
1834 | * the top of the screen |
1785 | */ |
1835 | */ |
1786 | int |
1836 | void |
1787 | rxvt_term::scr_move_to (int y, int len) |
1837 | rxvt_term::scr_move_to (int y, int len) NOTHROW |
1788 | { |
1838 | { |
1789 | long p = 0; |
1839 | scr_changeview ((top_row - nrow) * (len - y) / len + (nrow - 1)); |
1790 | unsigned int oldviewstart; |
|
|
1791 | |
|
|
1792 | oldviewstart = view_start; |
|
|
1793 | |
|
|
1794 | if (y < len) |
|
|
1795 | { |
|
|
1796 | p = (nrow + nsaved) * (len - y) / len; |
|
|
1797 | p -= (long) (nrow - 1); |
|
|
1798 | p = max (p, 0); |
|
|
1799 | } |
|
|
1800 | |
|
|
1801 | view_start = (unsigned int)min (p, nsaved); |
|
|
1802 | |
|
|
1803 | return scr_changeview (oldviewstart); |
|
|
1804 | } |
1840 | } |
1805 | |
1841 | |
1806 | /* ------------------------------------------------------------------------- */ |
1842 | /* ------------------------------------------------------------------------- */ |
1807 | /* |
1843 | /* |
1808 | * Page the screen up/down nlines |
1844 | * Page the screen up/down nlines |
1809 | * direction should be UP or DN |
1845 | * direction should be UP or DN |
1810 | */ |
1846 | */ |
1811 | int |
1847 | bool |
1812 | rxvt_term::scr_page (enum page_dirn direction, int nlines) |
1848 | rxvt_term::scr_page (enum page_dirn direction, int nlines) NOTHROW |
1813 | { |
1849 | { |
1814 | int n; |
1850 | int new_view_start = |
1815 | unsigned int oldviewstart; |
|
|
1816 | |
|
|
1817 | oldviewstart = view_start; |
|
|
1818 | |
|
|
1819 | if (direction == UP) |
|
|
1820 | { |
|
|
1821 | n = view_start + nlines; |
|
|
1822 | view_start = min (n, nsaved); |
|
|
1823 | } |
|
|
1824 | else |
|
|
1825 | { |
|
|
1826 | n = view_start - nlines; |
1851 | direction == UP ? view_start - nlines |
1827 | view_start = max (n, 0); |
1852 | : view_start + nlines; |
1828 | } |
|
|
1829 | |
1853 | |
1830 | return scr_changeview (oldviewstart); |
1854 | return scr_changeview (new_view_start); |
1831 | } |
1855 | } |
1832 | |
1856 | |
1833 | int |
1857 | bool |
1834 | rxvt_term::scr_changeview (unsigned int oldviewstart) |
1858 | rxvt_term::scr_changeview (int new_view_start) NOTHROW |
1835 | { |
1859 | { |
|
|
1860 | clamp_it (new_view_start, top_row, 0); |
|
|
1861 | |
1836 | if (view_start != oldviewstart) |
1862 | if (new_view_start == view_start) |
1837 | { |
1863 | return false; |
|
|
1864 | |
|
|
1865 | num_scr += new_view_start - view_start; |
|
|
1866 | view_start = new_view_start; |
|
|
1867 | want_refresh = 1; |
|
|
1868 | |
1838 | HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); |
1869 | HOOK_INVOKE ((this, HOOK_VIEW_CHANGE, DT_INT, view_start, DT_END)); |
1839 | |
1870 | |
1840 | want_refresh = 1; |
1871 | return true; |
1841 | num_scr -= (view_start - oldviewstart); |
|
|
1842 | } |
|
|
1843 | |
|
|
1844 | return (int)view_start - (int)oldviewstart; |
|
|
1845 | } |
1872 | } |
1846 | |
1873 | |
1847 | /* ------------------------------------------------------------------------- */ |
1874 | #ifndef NO_BELL |
1848 | void |
1875 | void |
|
|
1876 | rxvt_term::bell_cb (time_watcher &w) |
|
|
1877 | { |
|
|
1878 | rvideo_bell = false; |
|
|
1879 | scr_rvideo_mode (rvideo_mode); |
|
|
1880 | } |
|
|
1881 | #endif |
|
|
1882 | |
|
|
1883 | /* ------------------------------------------------------------------------- */ |
|
|
1884 | void |
1849 | rxvt_term::scr_bell () |
1885 | rxvt_term::scr_bell () NOTHROW |
1850 | { |
1886 | { |
1851 | #ifndef NO_BELL |
1887 | #ifndef NO_BELL |
1852 | |
1888 | |
1853 | # ifndef NO_MAPALERT |
1889 | # ifndef NO_MAPALERT |
1854 | # ifdef MAPALERT_OPTION |
1890 | # ifdef MAPALERT_OPTION |
1855 | if (OPTION (Opt_mapAlert)) |
1891 | if (OPTION (Opt_mapAlert)) |
1856 | # endif |
1892 | # endif |
1857 | XMapWindow (display->display, parent[0]); |
1893 | XMapWindow (xdisp, parent[0]); |
1858 | # endif |
1894 | # endif |
1859 | |
1895 | |
1860 | if (OPTION (Opt_visualBell)) |
1896 | if (OPTION (Opt_visualBell)) |
1861 | { |
1897 | { |
1862 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1898 | rvideo_bell = true; |
1863 | rxvt_usleep (VISUAL_BELL_DURATION); |
1899 | scr_rvideo_mode (rvideo_mode); |
1864 | scr_rvideo_mode (!rvideo); /* refresh also done */ |
1900 | display->flush (); |
|
|
1901 | |
|
|
1902 | bell_ev.start (NOW + VISUAL_BELL_DURATION); |
1865 | } |
1903 | } |
1866 | else |
1904 | else |
1867 | XBell (display->display, 0); |
1905 | XBell (xdisp, 0); |
1868 | |
1906 | |
1869 | #endif |
1907 | #endif |
1870 | } |
1908 | } |
1871 | |
1909 | |
1872 | /* ------------------------------------------------------------------------- */ |
1910 | /* ------------------------------------------------------------------------- */ |
1873 | /* ARGSUSED */ |
1911 | /* ARGSUSED */ |
1874 | void |
1912 | void |
1875 | rxvt_term::scr_printscreen (int fullhist) |
1913 | rxvt_term::scr_printscreen (int fullhist) NOTHROW |
1876 | { |
1914 | { |
1877 | #ifdef PRINTPIPE |
1915 | #ifdef PRINTPIPE |
1878 | int nrows, row_start; |
1916 | int nrows, row_start; |
1879 | FILE *fd; |
1917 | FILE *fd; |
1880 | |
1918 | |
1881 | if ((fd = popen_printer ()) == NULL) |
1919 | if ((fd = popen_printer ()) == NULL) |
1882 | return; |
1920 | return; |
1883 | |
1921 | |
1884 | if (fullhist) |
1922 | if (fullhist) |
1885 | { |
1923 | { |
1886 | nrows = nrow + nsaved; |
1924 | nrows = nrow - top_row; |
1887 | row_start = -nsaved; |
1925 | row_start = top_row; |
1888 | } |
1926 | } |
1889 | else |
1927 | else |
1890 | { |
1928 | { |
1891 | nrows = nrow; |
1929 | nrows = nrow; |
1892 | row_start = -view_start; |
1930 | row_start = view_start; |
1893 | } |
1931 | } |
1894 | |
1932 | |
1895 | wctomb (0, 0); |
1933 | wctomb (0, 0); |
1896 | |
1934 | |
1897 | for (int r1 = 0; r1 < nrows; r1++) |
1935 | for (int r1 = 0; r1 < nrows; r1++) |
… | |
… | |
1929 | * Refresh the screen |
1967 | * Refresh the screen |
1930 | * drawn_text/drawn_rend contain the screen information before the update. |
1968 | * drawn_text/drawn_rend contain the screen information before the update. |
1931 | * screen.text/screen.rend contain what the screen will change to. |
1969 | * screen.text/screen.rend contain what the screen will change to. |
1932 | */ |
1970 | */ |
1933 | void |
1971 | void |
1934 | rxvt_term::scr_refresh (unsigned char refresh_type) |
1972 | rxvt_term::scr_refresh () NOTHROW |
1935 | { |
1973 | { |
1936 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1974 | unsigned char must_clear, /* use draw_string not draw_image_string */ |
1937 | showcursor; /* show the cursor */ |
1975 | showcursor; /* show the cursor */ |
1938 | int16_t col, row, /* column/row we're processing */ |
1976 | int16_t col, row, /* column/row we're processing */ |
1939 | ocrow; /* old cursor row */ |
1977 | ocrow; /* old cursor row */ |
… | |
… | |
2025 | |
2063 | |
2026 | /* make sure no outline cursor is left around */ |
2064 | /* make sure no outline cursor is left around */ |
2027 | setoldcursor = 0; |
2065 | setoldcursor = 0; |
2028 | if (ocrow != -1) |
2066 | if (ocrow != -1) |
2029 | { |
2067 | { |
2030 | if (screen.cur.row + view_start != ocrow |
2068 | if (screen.cur.row - view_start != ocrow |
2031 | || screen.cur.col != oldcursor.col) |
2069 | || screen.cur.col != oldcursor.col) |
2032 | { |
2070 | { |
2033 | if (ocrow < nrow |
2071 | if (ocrow < nrow |
2034 | && oldcursor.col < ncol) |
2072 | && oldcursor.col < ncol) |
2035 | drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
2073 | drawn_buf[ocrow].r[oldcursor.col] ^= (RS_RVid | RS_Uline); |
… | |
… | |
2043 | else if (!focus) |
2081 | else if (!focus) |
2044 | setoldcursor = 1; |
2082 | setoldcursor = 1; |
2045 | |
2083 | |
2046 | if (setoldcursor) |
2084 | if (setoldcursor) |
2047 | { |
2085 | { |
2048 | if (screen.cur.row + view_start >= nrow) |
2086 | if (screen.cur.row - view_start >= nrow) |
2049 | oldcursor.row = -1; |
2087 | oldcursor.row = -1; |
2050 | else |
2088 | else |
2051 | { |
2089 | { |
2052 | oldcursor.row = screen.cur.row + view_start; |
2090 | oldcursor.row = screen.cur.row - view_start; |
2053 | oldcursor.col = screen.cur.col; |
2091 | oldcursor.col = screen.cur.col; |
2054 | } |
2092 | } |
2055 | } |
2093 | } |
2056 | } |
2094 | } |
2057 | |
2095 | |
… | |
… | |
2063 | #ifndef NO_SLOW_LINK_SUPPORT |
2101 | #ifndef NO_SLOW_LINK_SUPPORT |
2064 | /* |
2102 | /* |
2065 | * D: CopyArea pass - very useful for slower links |
2103 | * D: CopyArea pass - very useful for slower links |
2066 | * This has been deliberately kept simple. |
2104 | * This has been deliberately kept simple. |
2067 | */ |
2105 | */ |
2068 | i = num_scr; |
|
|
2069 | if (!display->is_local |
2106 | if (!display->is_local |
2070 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2107 | && refresh_type == FAST_REFRESH && num_scr_allow && num_scr |
2071 | && abs (num_scr) < nrow && !must_clear) |
2108 | && abs (num_scr) < nrow && !must_clear) |
2072 | { |
2109 | { |
2073 | int16_t nits; |
2110 | int16_t nits; |
2074 | int j; |
2111 | int j; |
2075 | int len, wlen; |
2112 | int len, wlen; |
|
|
2113 | dLocal (int, num_scr); |
2076 | |
2114 | |
2077 | j = nrow; |
2115 | j = nrow; |
2078 | wlen = len = -1; |
2116 | wlen = len = -1; |
2079 | row = i > 0 ? 0 : j - 1; |
2117 | row = i > 0 ? 0 : j - 1; |
2080 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2118 | for (; j-- >= 0; row += (i > 0 ? 1 : -1)) |
2081 | { |
2119 | { |
2082 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2120 | if (row + i >= 0 && row + i < nrow && row + i != ocrow) |
2083 | { |
2121 | { |
2084 | line_t s = ROW(row - view_start); |
2122 | line_t s = ROW(view_start + row); |
2085 | line_t d = drawn_buf[row]; |
2123 | line_t d = drawn_buf[row]; |
2086 | line_t d2 = drawn_buf[row + i]; |
2124 | line_t d2 = drawn_buf[row + i]; |
2087 | |
2125 | |
2088 | for (nits = 0, col = ncol; col--; ) |
2126 | for (nits = 0, col = ncol; col--; ) |
2089 | if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) |
2127 | if (s.t[col] != d2.t[col] || s.r[col] != d2.r[col]) |
… | |
… | |
2111 | { |
2149 | { |
2112 | /* also comes here at end if needed because of >= above */ |
2150 | /* also comes here at end if needed because of >= above */ |
2113 | if (wlen < len) |
2151 | if (wlen < len) |
2114 | ::swap (wlen, len); |
2152 | ::swap (wlen, len); |
2115 | |
2153 | |
2116 | XCopyArea (display->display, vt, vt, |
2154 | XCopyArea (xdisp, vt, vt, |
2117 | gc, 0, Row2Pixel (len + i), |
2155 | gc, 0, Row2Pixel (len + i), |
2118 | (unsigned int)this->width, |
2156 | (unsigned int)this->width, |
2119 | (unsigned int)Height2Pixel (wlen - len + 1), |
2157 | (unsigned int)Height2Pixel (wlen - len + 1), |
2120 | 0, Row2Pixel (len)); |
2158 | 0, Row2Pixel (len)); |
2121 | len = -1; |
2159 | len = -1; |
… | |
… | |
2127 | /* |
2165 | /* |
2128 | * E: main pass across every character |
2166 | * E: main pass across every character |
2129 | */ |
2167 | */ |
2130 | for (row = 0; row < nrow; row++) |
2168 | for (row = 0; row < nrow; row++) |
2131 | { |
2169 | { |
2132 | text_t *stp = ROW(row - view_start).t; |
2170 | text_t *stp = ROW(view_start + row).t; |
2133 | rend_t *srp = ROW(row - view_start).r; |
2171 | rend_t *srp = ROW(view_start + row).r; |
2134 | text_t *dtp = drawn_buf[row].t; |
2172 | text_t *dtp = drawn_buf[row].t; |
2135 | rend_t *drp = drawn_buf[row].r; |
2173 | rend_t *drp = drawn_buf[row].r; |
2136 | |
2174 | |
2137 | /* |
2175 | /* |
2138 | * E2: OK, now the real pass |
2176 | * E2: OK, now the real pass |
… | |
… | |
2209 | |
2247 | |
2210 | // only do special processing if any attributes are set, which is unlikely |
2248 | // only do special processing if any attributes are set, which is unlikely |
2211 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2249 | if (rend & (RS_Bold | RS_Italic | RS_Uline | RS_RVid | RS_Blink | RS_Careful)) |
2212 | { |
2250 | { |
2213 | #if ENABLE_STYLES |
2251 | #if ENABLE_STYLES |
2214 | // force redraw after "careful" characters to avoid pixel droppings |
2252 | // "careful" (too wide) character handling |
2215 | if (srp[col] & RS_Careful && col < ncol - 1 && 0) |
|
|
2216 | drp[col + 1] = ~srp[col + 1]; |
|
|
2217 | |
2253 | |
2218 | // include previous careful character(s) if possible, looks nicer (best effort...) |
2254 | // include previous careful character(s) if possible, looks nicer (best effort...) |
2219 | while (text > stp |
2255 | while (text > stp |
2220 | && srp[text - stp - 1] & RS_Careful |
2256 | && srp[text - stp - 1] & RS_Careful |
2221 | && RS_SAME (rend, srp[text - stp - 1])) |
2257 | && RS_SAME (rend, srp[text - stp - 1])) |
2222 | text--, count++, xpixel -= fwidth; |
2258 | text--, count++, xpixel -= fwidth; |
|
|
2259 | |
|
|
2260 | // force redraw after "careful" characters to avoid pixel droppings |
|
|
2261 | for (int i = 0; srp[col + i] & RS_Careful && col + i < ncol - 1; i++) |
|
|
2262 | drp[col + i + 1] = srp[col + i + 1] ^ RS_redraw; |
|
|
2263 | |
|
|
2264 | // force redraw before "careful" characters to avoid pixel droppings |
|
|
2265 | for (int i = 0; srp[text - stp - i] & RS_Careful && text - i > stp; i++) |
|
|
2266 | drp[text - stp - i - 1] = srp[text - stp - i - 1] ^ RS_redraw; |
2223 | #endif |
2267 | #endif |
2224 | |
2268 | |
2225 | bool invert = rend & RS_RVid; |
2269 | bool invert = rend & RS_RVid; |
2226 | |
2270 | |
2227 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
2271 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
… | |
… | |
2311 | |
2355 | |
2312 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2356 | if (rend & RS_Uline && font->descent > 1 && fore != back) |
2313 | { |
2357 | { |
2314 | #if ENABLE_FRILLS |
2358 | #if ENABLE_FRILLS |
2315 | if (ISSET_PIXCOLOR (Color_underline)) |
2359 | if (ISSET_PIXCOLOR (Color_underline)) |
2316 | XSetForeground (display->display, gc, pix_colors[Color_underline]); |
2360 | XSetForeground (xdisp, gc, pix_colors[Color_underline]); |
2317 | else |
2361 | else |
2318 | #endif |
2362 | #endif |
2319 | XSetForeground (display->display, gc, pix_colors[fore]); |
2363 | XSetForeground (xdisp, gc, pix_colors[fore]); |
2320 | |
2364 | |
2321 | XDrawLine (display->display, drawBuffer, gc, |
2365 | XDrawLine (xdisp, drawBuffer, gc, |
2322 | xpixel, ypixel + font->ascent + 1, |
2366 | xpixel, ypixel + font->ascent + 1, |
2323 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2367 | xpixel + Width2Pixel (count) - 1, ypixel + font->ascent + 1); |
2324 | } |
2368 | } |
2325 | } /* for (col....) */ |
2369 | } /* for (col....) */ |
2326 | } /* for (row....) */ |
2370 | } /* for (row....) */ |
… | |
… | |
2359 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2403 | && drawn_buf[oldcursor.row].t[col + cursorwidth] == NOCHAR) |
2360 | cursorwidth++; |
2404 | cursorwidth++; |
2361 | |
2405 | |
2362 | #ifndef NO_CURSORCOLOR |
2406 | #ifndef NO_CURSORCOLOR |
2363 | if (ISSET_PIXCOLOR (Color_cursor)) |
2407 | if (ISSET_PIXCOLOR (Color_cursor)) |
2364 | XSetForeground (display->display, gc, pix_colors[Color_cursor]); |
2408 | XSetForeground (xdisp, gc, pix_colors[Color_cursor]); |
2365 | #endif |
2409 | #endif |
2366 | |
2410 | |
2367 | XDrawRectangle (display->display, drawBuffer, gc, |
2411 | XDrawRectangle (xdisp, drawBuffer, gc, |
2368 | Col2Pixel (col), |
2412 | Col2Pixel (col), |
2369 | Row2Pixel (oldcursor.row), |
2413 | Row2Pixel (oldcursor.row), |
2370 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2414 | (unsigned int) (Width2Pixel (cursorwidth) - 1), |
2371 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2415 | (unsigned int) (Height2Pixel (1) - lineSpace - 1)); |
2372 | } |
2416 | } |
… | |
… | |
2375 | /* |
2419 | /* |
2376 | * H: cleanup selection |
2420 | * H: cleanup selection |
2377 | */ |
2421 | */ |
2378 | scr_reverse_selection (); |
2422 | scr_reverse_selection (); |
2379 | |
2423 | |
2380 | if (refresh_type & SMOOTH_REFRESH) |
|
|
2381 | XFlush (display->display); |
|
|
2382 | |
|
|
2383 | num_scr = 0; |
2424 | num_scr = 0; |
2384 | num_scr_allow = 1; |
2425 | num_scr_allow = 1; |
2385 | } |
2426 | } |
2386 | |
2427 | |
2387 | void |
2428 | void |
2388 | rxvt_term::scr_remap_chars (line_t &l) |
2429 | rxvt_term::scr_remap_chars (line_t &l) NOTHROW |
2389 | { |
2430 | { |
2390 | if (!l.t) |
2431 | if (!l.t) |
2391 | return; |
2432 | return; |
2392 | |
2433 | |
2393 | l.touch (); // maybe a bit of an overkill, but its not performance-relevant |
2434 | l.touch (); // maybe a bit of an overkill, but it's not performance-relevant |
2394 | |
2435 | |
2395 | for (int i = ncol; i--; ) |
2436 | for (int i = ncol; i--; ) |
2396 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2437 | l.r[i] = SET_FONT (l.r[i], FONTSET (l.r[i])->find_font (l.t[i])); |
2397 | } |
2438 | } |
2398 | |
2439 | |
2399 | void |
2440 | void |
2400 | rxvt_term::scr_remap_chars () |
2441 | rxvt_term::scr_remap_chars () NOTHROW |
2401 | { |
2442 | { |
2402 | for (int i = total_rows; i--; ) |
2443 | for (int i = total_rows; i--; ) |
2403 | scr_remap_chars (row_buf [i]); |
2444 | scr_remap_chars (row_buf [i]); |
2404 | |
2445 | |
2405 | for (int i = nrow; i--; ) |
2446 | for (int i = nrow; i--; ) |
… | |
… | |
2408 | scr_remap_chars (swap_buf [i]); |
2449 | scr_remap_chars (swap_buf [i]); |
2409 | } |
2450 | } |
2410 | } |
2451 | } |
2411 | |
2452 | |
2412 | void |
2453 | void |
2413 | rxvt_term::scr_recolour () |
2454 | rxvt_term::scr_recolour () NOTHROW |
2414 | { |
2455 | { |
2415 | if (1 |
2456 | if (1 |
2416 | #if TRANSPARENT |
2457 | #if TRANSPARENT |
2417 | && !am_transparent |
2458 | && !am_transparent |
2418 | #endif |
2459 | #endif |
2419 | #if XPM_BACKGROUND |
2460 | #if XPM_BACKGROUND |
2420 | && !bgPixmap.pixmap |
2461 | && !bgPixmap.pixmap |
2421 | #endif |
2462 | #endif |
2422 | ) |
2463 | ) |
2423 | { |
2464 | { |
2424 | XSetWindowBackground (display->display, parent[0], pix_colors[Color_border]); |
2465 | XSetWindowBackground (xdisp, parent[0], pix_colors[Color_border]); |
2425 | XClearWindow (display->display, parent[0]); |
2466 | XClearWindow (xdisp, parent[0]); |
2426 | XSetWindowBackground (display->display, vt, pix_colors[Color_bg]); |
2467 | XSetWindowBackground (xdisp, vt, pix_colors[Color_bg]); |
2427 | #if HAVE_SCROLLBARS |
2468 | #if HAVE_SCROLLBARS |
2428 | if (scrollBar.win) |
2469 | if (scrollBar.win) |
2429 | { |
2470 | { |
2430 | XSetWindowBackground (display->display, scrollBar.win, pix_colors[Color_border]); |
2471 | XSetWindowBackground (xdisp, scrollBar.win, pix_colors[Color_border]); |
2431 | scrollBar.setIdle (); |
2472 | scrollBar.setIdle (); |
2432 | scrollbar_show (0); |
2473 | scrollbar_show (0); |
2433 | } |
2474 | } |
2434 | #endif |
2475 | #endif |
2435 | } |
2476 | } |
… | |
… | |
2439 | want_refresh = 1; |
2480 | want_refresh = 1; |
2440 | } |
2481 | } |
2441 | |
2482 | |
2442 | /* ------------------------------------------------------------------------- */ |
2483 | /* ------------------------------------------------------------------------- */ |
2443 | void |
2484 | void |
2444 | rxvt_term::scr_clear (bool really) |
2485 | rxvt_term::scr_clear (bool really) NOTHROW |
2445 | { |
2486 | { |
2446 | if (!mapped) |
2487 | if (!mapped) |
2447 | return; |
2488 | return; |
2448 | |
2489 | |
2449 | num_scr_allow = 0; |
2490 | num_scr_allow = 0; |
2450 | want_refresh = 1; |
2491 | want_refresh = 1; |
2451 | |
2492 | |
2452 | if (really) |
2493 | if (really) |
2453 | XClearWindow (display->display, vt); |
2494 | XClearWindow (xdisp, vt); |
2454 | } |
2495 | } |
2455 | |
2496 | |
2456 | /* ------------------------------------------------------------------------- */ |
|
|
2457 | void |
2497 | void |
|
|
2498 | rxvt_term::scr_xor_rect (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle1, rend_t rstyle2) NOTHROW |
|
|
2499 | { |
|
|
2500 | int view_end = view_start + nrow; |
|
|
2501 | int row, col; |
|
|
2502 | |
|
|
2503 | for (row = max (beg_row, view_start); row <= min (end_row, view_end); row++) |
|
|
2504 | { |
|
|
2505 | text_t *stp = ROW(row).t; |
|
|
2506 | rend_t *srp = ROW(row).r; |
|
|
2507 | |
|
|
2508 | for (col = beg_col; col < end_col; col++) |
|
|
2509 | srp[col] ^= rstyle1; |
|
|
2510 | |
|
|
2511 | while (col-- > beg_col && (stp[col] == NOCHAR || unicode::is_space (stp[col]))) |
|
|
2512 | srp[col] ^= rstyle2; |
|
|
2513 | |
|
|
2514 | if (++col < end_col) |
|
|
2515 | srp[col] ^= rstyle2; |
|
|
2516 | } |
|
|
2517 | } |
|
|
2518 | |
|
|
2519 | void |
|
|
2520 | rxvt_term::scr_xor_span (int beg_row, int beg_col, int end_row, int end_col, rend_t rstyle) NOTHROW |
|
|
2521 | { |
|
|
2522 | int view_end = view_start + nrow; |
|
|
2523 | int row, col; |
|
|
2524 | |
|
|
2525 | if (beg_row >= view_start) |
|
|
2526 | { |
|
|
2527 | col = beg_col; |
|
|
2528 | row = beg_row; |
|
|
2529 | } |
|
|
2530 | else |
|
|
2531 | { |
|
|
2532 | col = 0; |
|
|
2533 | row = view_start; |
|
|
2534 | } |
|
|
2535 | |
|
|
2536 | for (; row < min (end_row, view_end); row++, col = 0) |
|
|
2537 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
|
|
2538 | srp[col] ^= rstyle; |
|
|
2539 | |
|
|
2540 | if (row == end_row) |
|
|
2541 | for (rend_t *srp = ROW(row).r; col < end_col; col++) |
|
|
2542 | srp[col] ^= rstyle; |
|
|
2543 | } |
|
|
2544 | |
|
|
2545 | /* ------------------------------------------------------------------------- */ |
|
|
2546 | void |
2458 | rxvt_term::scr_reverse_selection () |
2547 | rxvt_term::scr_reverse_selection () NOTHROW |
2459 | { |
2548 | { |
2460 | if (selection.op |
2549 | if (selection.op |
2461 | && current_screen == selection.screen |
2550 | && current_screen == selection.screen |
2462 | && selection.end.row >= -view_start) |
2551 | && selection.end.row >= view_start) |
2463 | { |
2552 | { |
2464 | int view_end = -view_start + nrow; |
2553 | #if !ENABLE_MINIMAL |
2465 | int row, col; |
|
|
2466 | |
|
|
2467 | #if ENABLE_FRILLS |
|
|
2468 | if (selection.rect) |
2554 | if (selection.rect) |
2469 | { |
2555 | scr_xor_rect (selection.beg.row, selection.beg.col, |
2470 | for (row = max (selection.beg.row, -view_start); row <= min (selection.end.row, view_end); row++) |
2556 | selection.end.row, selection.end.col, |
2471 | { |
2557 | RS_RVid, RS_RVid | RS_Uline); |
2472 | text_t *stp = ROW(row).t; |
|
|
2473 | rend_t *srp = ROW(row).r; |
|
|
2474 | |
|
|
2475 | for (col = selection.beg.col; col < selection.end.col; col++) |
|
|
2476 | srp[col] ^= RS_RVid; |
|
|
2477 | |
|
|
2478 | while (col-- > selection.beg.col && (stp[col] == NOCHAR || unicode::is_space (stp[col]))) |
|
|
2479 | srp[col] ^= RS_RVid | RS_Uline; |
|
|
2480 | |
|
|
2481 | if (++col < selection.end.col) |
|
|
2482 | srp[col] ^= RS_RVid | RS_Uline; |
|
|
2483 | } |
|
|
2484 | } |
|
|
2485 | else |
2558 | else |
2486 | #endif |
2559 | #endif |
2487 | { |
2560 | scr_xor_span (selection.beg.row, selection.beg.col, |
2488 | if (selection.beg.row >= -view_start) |
2561 | selection.end.row, selection.end.col, |
2489 | { |
2562 | RS_RVid); |
2490 | col = selection.beg.col; |
|
|
2491 | row = selection.beg.row; |
|
|
2492 | } |
|
|
2493 | else |
|
|
2494 | { |
|
|
2495 | col = 0; |
|
|
2496 | row = -view_start; |
|
|
2497 | } |
|
|
2498 | |
|
|
2499 | for (; row < min (selection.end.row, view_end); row++, col = 0) |
|
|
2500 | for (rend_t *srp = ROW(row).r; col < ncol; col++) |
|
|
2501 | srp[col] ^= RS_RVid; |
|
|
2502 | |
|
|
2503 | if (row == selection.end.row) |
|
|
2504 | for (rend_t *srp = ROW(row).r; col < selection.end.col; col++) |
|
|
2505 | srp[col] ^= RS_RVid; |
|
|
2506 | } |
|
|
2507 | } |
2563 | } |
2508 | } |
2564 | } |
2509 | |
2565 | |
2510 | /* ------------------------------------------------------------------------- */ |
2566 | /* ------------------------------------------------------------------------- */ |
2511 | /* |
2567 | /* |
2512 | * Dump the whole scrollback and screen to the passed filedescriptor. The |
2568 | * Dump the whole scrollback and screen to the passed filedescriptor. The |
2513 | * invoking routine must close the fd. |
2569 | * invoking routine must close the fd. |
2514 | */ |
2570 | */ |
2515 | #if 0 |
2571 | #if 0 |
2516 | void |
2572 | void |
2517 | rxvt_term::scr_dump (int fd) |
2573 | rxvt_term::scr_dump (int fd) NOTHROW |
2518 | { |
2574 | { |
2519 | int row, wrote; |
2575 | int row, wrote; |
2520 | unsigned int width, towrite; |
2576 | unsigned int width, towrite; |
2521 | char r1[] = "\n"; |
2577 | char r1[] = "\n"; |
2522 | |
2578 | |
… | |
… | |
2541 | |
2597 | |
2542 | /* ------------------------------------------------------------------------- * |
2598 | /* ------------------------------------------------------------------------- * |
2543 | * CHARACTER SELECTION * |
2599 | * CHARACTER SELECTION * |
2544 | * ------------------------------------------------------------------------- */ |
2600 | * ------------------------------------------------------------------------- */ |
2545 | void |
2601 | void |
2546 | rxvt_term::selection_check (int check_more) |
2602 | rxvt_term::selection_check (int check_more) NOTHROW |
2547 | { |
2603 | { |
2548 | row_col_t pos; |
2604 | row_col_t pos; |
2549 | |
2605 | |
2550 | if (!selection.op) |
2606 | if (!selection.op) |
2551 | return; |
2607 | return; |
2552 | |
2608 | |
2553 | pos.row = pos.col = 0; |
2609 | pos.row = pos.col = 0; |
2554 | if (!IN_RANGE_EXC (selection.beg.row, -nsaved, nrow) |
2610 | if (!IN_RANGE_EXC (selection.beg.row, top_row, nrow) |
2555 | || !IN_RANGE_EXC (selection.mark.row, -nsaved, nrow) |
2611 | || !IN_RANGE_EXC (selection.mark.row, top_row, nrow) |
2556 | || !IN_RANGE_EXC (selection.end.row, -nsaved, nrow) |
2612 | || !IN_RANGE_EXC (selection.end.row, top_row, nrow) |
2557 | || (check_more == 1 |
2613 | || (check_more == 1 |
2558 | && current_screen == selection.screen |
2614 | && current_screen == selection.screen |
2559 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2615 | && !ROWCOL_IS_BEFORE (screen.cur, selection.beg) |
2560 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2616 | && ROWCOL_IS_BEFORE (screen.cur, selection.end)) |
2561 | || (check_more == 2 |
2617 | || (check_more == 2 |
… | |
… | |
2572 | /* ------------------------------------------------------------------------- */ |
2628 | /* ------------------------------------------------------------------------- */ |
2573 | /* |
2629 | /* |
2574 | * Paste a selection direct to the command fd |
2630 | * Paste a selection direct to the command fd |
2575 | */ |
2631 | */ |
2576 | void |
2632 | void |
2577 | rxvt_term::paste (char *data, unsigned int len) |
2633 | rxvt_term::paste (char *data, unsigned int len) NOTHROW |
2578 | { |
2634 | { |
2579 | /* convert normal newline chars into common keyboard Return key sequence */ |
2635 | /* convert normal newline chars into common keyboard Return key sequence */ |
2580 | for (unsigned int i = 0; i < len; i++) |
2636 | for (unsigned int i = 0; i < len; i++) |
2581 | if (data[i] == C0_LF) |
2637 | if (data[i] == C0_LF) |
2582 | data[i] = C0_CR; |
2638 | data[i] = C0_CR; |
… | |
… | |
2588 | /* |
2644 | /* |
2589 | * Respond to a notification that a primary selection has been sent |
2645 | * Respond to a notification that a primary selection has been sent |
2590 | * EXT: SelectionNotify |
2646 | * EXT: SelectionNotify |
2591 | */ |
2647 | */ |
2592 | void |
2648 | void |
2593 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) |
2649 | rxvt_term::selection_paste (Window win, Atom prop, bool delete_prop) NOTHROW |
2594 | { |
2650 | { |
2595 | if (prop == None) /* check for failed XConvertSelection */ |
2651 | if (prop == None) /* check for failed XConvertSelection */ |
2596 | { |
2652 | { |
2597 | if ((selection_type & Sel_CompoundText)) |
2653 | if ((selection_type & Sel_CompoundText)) |
2598 | { |
2654 | { |
… | |
… | |
2618 | } |
2674 | } |
2619 | |
2675 | |
2620 | unsigned long bytes_after; |
2676 | unsigned long bytes_after; |
2621 | XTextProperty ct; |
2677 | XTextProperty ct; |
2622 | |
2678 | |
2623 | if (XGetWindowProperty (display->display, win, prop, |
2679 | if (XGetWindowProperty (xdisp, win, prop, |
2624 | 0, PROP_SIZE / 4, |
2680 | 0, PROP_SIZE / 4, |
2625 | delete_prop, AnyPropertyType, |
2681 | delete_prop, AnyPropertyType, |
2626 | &ct.encoding, &ct.format, |
2682 | &ct.encoding, &ct.format, |
2627 | &ct.nitems, &bytes_after, |
2683 | &ct.nitems, &bytes_after, |
2628 | &ct.value) != Success) |
2684 | &ct.value) != Success) |
… | |
… | |
2637 | if (bytes_after) |
2693 | if (bytes_after) |
2638 | { |
2694 | { |
2639 | // fetch and append remaining data |
2695 | // fetch and append remaining data |
2640 | XTextProperty ct2; |
2696 | XTextProperty ct2; |
2641 | |
2697 | |
2642 | if (XGetWindowProperty (display->display, win, prop, |
2698 | if (XGetWindowProperty (xdisp, win, prop, |
2643 | ct.nitems / 4, (bytes_after + 3) / 4, |
2699 | ct.nitems / 4, (bytes_after + 3) / 4, |
2644 | delete_prop, AnyPropertyType, |
2700 | delete_prop, AnyPropertyType, |
2645 | &ct2.encoding, &ct2.format, |
2701 | &ct2.encoding, &ct2.format, |
2646 | &ct2.nitems, &bytes_after, |
2702 | &ct2.nitems, &bytes_after, |
2647 | &ct2.value) != Success) |
2703 | &ct2.value) != Success) |
… | |
… | |
2660 | |
2716 | |
2661 | if (ct.encoding == xa[XA_INCR]) |
2717 | if (ct.encoding == xa[XA_INCR]) |
2662 | { |
2718 | { |
2663 | // INCR selection, start handshake |
2719 | // INCR selection, start handshake |
2664 | if (!delete_prop) |
2720 | if (!delete_prop) |
2665 | XDeleteProperty (display->display, win, prop); |
2721 | XDeleteProperty (xdisp, win, prop); |
2666 | |
2722 | |
2667 | selection_wait = Sel_incr; |
2723 | selection_wait = Sel_incr; |
2668 | incr_buf_fill = 0; |
2724 | incr_buf_fill = 0; |
2669 | incr_ev.start (NOW + 10); |
2725 | incr_ev.start (NOW + 10); |
2670 | |
2726 | |
… | |
… | |
2717 | } |
2773 | } |
2718 | |
2774 | |
2719 | char **cl; |
2775 | char **cl; |
2720 | int cr; |
2776 | int cr; |
2721 | |
2777 | |
2722 | #if ENABLE_FRILLS |
2778 | #if !ENABLE_MINIMAL |
2723 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2779 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
2724 | // so recode it manually |
2780 | // so recode it manually |
2725 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2781 | if (ct.encoding == xa[XA_UTF8_STRING]) |
2726 | { |
2782 | { |
2727 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
2783 | wchar_t *w = rxvt_utf8towcs ((const char *)ct.value, ct.nitems); |
… | |
… | |
2731 | paste (s, strlen (s)); |
2787 | paste (s, strlen (s)); |
2732 | free (s); |
2788 | free (s); |
2733 | } |
2789 | } |
2734 | else |
2790 | else |
2735 | #endif |
2791 | #endif |
2736 | if (XmbTextPropertyToTextList (display->display, &ct, &cl, &cr) >= 0 |
2792 | if (XmbTextPropertyToTextList (xdisp, &ct, &cl, &cr) >= 0 |
2737 | && cl) |
2793 | && cl) |
2738 | { |
2794 | { |
2739 | for (int i = 0; i < cr; i++) |
2795 | for (int i = 0; i < cr; i++) |
2740 | paste (cl[i], strlen (cl[i])); |
2796 | paste (cl[i], strlen (cl[i])); |
2741 | |
2797 | |
… | |
… | |
2750 | if (selection_wait == Sel_normal) |
2806 | if (selection_wait == Sel_normal) |
2751 | selection_wait = Sel_none; |
2807 | selection_wait = Sel_none; |
2752 | } |
2808 | } |
2753 | |
2809 | |
2754 | void |
2810 | void |
2755 | rxvt_term::incr_cb (time_watcher &w) |
2811 | rxvt_term::incr_cb (time_watcher &w) NOTHROW |
2756 | { |
2812 | { |
2757 | selection_wait = Sel_none; |
2813 | selection_wait = Sel_none; |
2758 | |
2814 | |
2759 | incr_buf_size = 0; |
2815 | incr_buf_size = 0; |
2760 | free (incr_buf); |
2816 | free (incr_buf); |
2761 | |
2817 | |
2762 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2818 | rxvt_warn ("data loss: timeout on INCR selection paste, ignoring.\n"); |
2763 | } |
2819 | } |
2764 | |
2820 | |
2765 | void |
2821 | void |
2766 | rxvt_term::selection_property (Window win, Atom prop) |
2822 | rxvt_term::selection_property (Window win, Atom prop) NOTHROW |
2767 | { |
2823 | { |
2768 | if (prop == None || selection_wait != Sel_incr) |
2824 | if (prop == None || selection_wait != Sel_incr) |
2769 | return; |
2825 | return; |
2770 | |
2826 | |
2771 | selection_paste (win, prop, true); |
2827 | selection_paste (win, prop, true); |
… | |
… | |
2780 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2836 | * (+) if ownership is claimed but property is empty, rxvt_selection_paste () |
2781 | * will auto fallback to CUT_BUFFER0 |
2837 | * will auto fallback to CUT_BUFFER0 |
2782 | * EXT: button 2 release |
2838 | * EXT: button 2 release |
2783 | */ |
2839 | */ |
2784 | void |
2840 | void |
2785 | rxvt_term::selection_request (Time tm, int x, int y) |
2841 | rxvt_term::selection_request (Time tm, int selnum) NOTHROW |
2786 | { |
2842 | { |
2787 | if (x < 0 || x >= width || y < 0 || y >= height) |
2843 | if (selection.text && selnum == Sel_Primary) |
2788 | return; /* outside window */ |
|
|
2789 | |
|
|
2790 | if (selection.text) |
|
|
2791 | { /* internal selection */ |
2844 | { /* internal selection */ |
2792 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2845 | char *str = rxvt_wcstombs (selection.text, selection.len); |
2793 | paste (str, strlen (str)); |
2846 | paste (str, strlen (str)); |
2794 | free (str); |
2847 | free (str); |
2795 | return; |
2848 | return; |
2796 | } |
2849 | } |
2797 | else |
2850 | else |
2798 | { |
2851 | { |
2799 | int i; |
|
|
2800 | |
|
|
2801 | selection_request_time = tm; |
2852 | selection_request_time = tm; |
2802 | selection_wait = Sel_normal; |
2853 | selection_wait = Sel_normal; |
2803 | |
2854 | |
2804 | for (i = Sel_Primary; i <= Sel_Clipboard; i++) |
|
|
2805 | { |
|
|
2806 | #if X_HAVE_UTF8_STRING |
2855 | #if X_HAVE_UTF8_STRING |
2807 | selection_type = Sel_UTF8String; |
2856 | selection_type = Sel_UTF8String; |
2808 | if (selection_request_other (xa[XA_UTF8_STRING], i)) |
2857 | if (selection_request_other (xa[XA_UTF8_STRING], selnum)) |
2809 | return; |
2858 | return; |
2810 | #else |
2859 | #else |
2811 | selection_type = Sel_CompoundText; |
2860 | selection_type = Sel_CompoundText; |
2812 | if (selection_request_other (xa[XA_COMPOUND_TEXT], i)) |
2861 | if (selection_request_other (xa[XA_COMPOUND_TEXT], selnum)) |
2813 | return; |
2862 | return; |
2814 | #endif |
2863 | #endif |
2815 | } |
|
|
2816 | } |
2864 | } |
2817 | |
2865 | |
2818 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2866 | selection_wait = Sel_none; /* don't loop in selection_paste () */ |
2819 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2867 | selection_paste (display->root, XA_CUT_BUFFER0, false); |
2820 | } |
2868 | } |
2821 | |
2869 | |
2822 | int |
2870 | int |
2823 | rxvt_term::selection_request_other (Atom target, int selnum) |
2871 | rxvt_term::selection_request_other (Atom target, int selnum) NOTHROW |
2824 | { |
2872 | { |
2825 | Atom sel; |
2873 | Atom sel; |
2826 | |
2874 | |
2827 | selection_type |= selnum; |
2875 | selection_type |= selnum; |
2828 | |
2876 | |
… | |
… | |
2831 | else if (selnum == Sel_Secondary) |
2879 | else if (selnum == Sel_Secondary) |
2832 | sel = XA_SECONDARY; |
2880 | sel = XA_SECONDARY; |
2833 | else |
2881 | else |
2834 | sel = xa[XA_CLIPBOARD]; |
2882 | sel = xa[XA_CLIPBOARD]; |
2835 | |
2883 | |
2836 | if (XGetSelectionOwner (display->display, sel) != None) |
2884 | if (XGetSelectionOwner (xdisp, sel) != None) |
2837 | { |
2885 | { |
2838 | XConvertSelection (display->display, sel, target, xa[XA_VT_SELECTION], |
2886 | XConvertSelection (xdisp, sel, target, xa[XA_VT_SELECTION], |
2839 | vt, selection_request_time); |
2887 | vt, selection_request_time); |
2840 | return 1; |
2888 | return 1; |
2841 | } |
2889 | } |
2842 | |
2890 | |
2843 | return 0; |
2891 | return 0; |
… | |
… | |
2847 | /* |
2895 | /* |
2848 | * Clear all selected text |
2896 | * Clear all selected text |
2849 | * EXT: SelectionClear |
2897 | * EXT: SelectionClear |
2850 | */ |
2898 | */ |
2851 | void |
2899 | void |
2852 | rxvt_term::selection_clear () |
2900 | rxvt_term::selection_clear () NOTHROW |
2853 | { |
2901 | { |
2854 | want_refresh = 1; |
2902 | want_refresh = 1; |
2855 | free (selection.text); |
2903 | free (selection.text); |
2856 | selection.text = NULL; |
2904 | selection.text = NULL; |
2857 | selection.len = 0; |
2905 | selection.len = 0; |
… | |
… | |
2906 | |
2954 | |
2907 | int end_col; |
2955 | int end_col; |
2908 | |
2956 | |
2909 | for (; row <= selection.end.row; row++, col = 0) |
2957 | for (; row <= selection.end.row; row++, col = 0) |
2910 | { |
2958 | { |
2911 | #if ENABLE_FRILLS |
2959 | #if !ENABLE_MINIMAL |
2912 | if (selection.rect) |
2960 | if (selection.rect) |
2913 | { |
2961 | { |
2914 | col = selection.beg.col; |
2962 | col = selection.beg.col; |
2915 | end_col = ncol + 1; |
2963 | end_col = ncol + 1; |
2916 | } |
2964 | } |
… | |
… | |
2919 | end_col = ROW(row).l; |
2967 | end_col = ROW(row).l; |
2920 | |
2968 | |
2921 | col = max (col, 0); |
2969 | col = max (col, 0); |
2922 | |
2970 | |
2923 | if (row == selection.end.row |
2971 | if (row == selection.end.row |
2924 | #if ENABLE_FRILLS |
2972 | #if !ENABLE_MINIMAL |
2925 | || selection.rect |
2973 | || selection.rect |
2926 | #endif |
2974 | #endif |
2927 | ) |
2975 | ) |
2928 | min_it (end_col, selection.end.col); |
2976 | min_it (end_col, selection.end.col); |
2929 | |
2977 | |
… | |
… | |
2952 | #endif |
3000 | #endif |
2953 | else |
3001 | else |
2954 | new_selection_text[ofs++] = *t++; |
3002 | new_selection_text[ofs++] = *t++; |
2955 | } |
3003 | } |
2956 | |
3004 | |
2957 | #if ENABLE_FRILLS |
3005 | #if !ENABLE_MINIMAL |
2958 | if (selection.rect) |
3006 | if (selection.rect) |
2959 | { |
3007 | { |
2960 | while (ofs |
3008 | while (ofs |
2961 | && new_selection_text[ofs - 1] != C0_LF |
3009 | && new_selection_text[ofs - 1] != C0_LF |
2962 | && unicode::is_space (new_selection_text[ofs - 1])) |
3010 | && unicode::is_space (new_selection_text[ofs - 1])) |
… | |
… | |
2992 | |
3040 | |
2993 | selection_grab (tm); |
3041 | selection_grab (tm); |
2994 | } |
3042 | } |
2995 | |
3043 | |
2996 | bool |
3044 | bool |
2997 | rxvt_term::selection_grab (Time tm) |
3045 | rxvt_term::selection_grab (Time tm) NOTHROW |
2998 | { |
3046 | { |
2999 | selection_time = tm; |
3047 | selection_time = tm; |
3000 | |
3048 | |
3001 | XSetSelectionOwner (display->display, XA_PRIMARY, vt, tm); |
3049 | XSetSelectionOwner (xdisp, XA_PRIMARY, vt, tm); |
3002 | if (XGetSelectionOwner (display->display, XA_PRIMARY) == vt) |
3050 | if (XGetSelectionOwner (xdisp, XA_PRIMARY) == vt) |
3003 | { |
3051 | { |
3004 | display->set_selection_owner (this); |
3052 | display->set_selection_owner (this); |
3005 | return true; |
3053 | return true; |
3006 | } |
3054 | } |
3007 | else |
3055 | else |
|
|
3056 | { |
|
|
3057 | selection_clear (); |
3008 | return false; |
3058 | return false; |
|
|
3059 | } |
3009 | |
3060 | |
3010 | #if 0 |
3061 | #if 0 |
3011 | XTextProperty ct; |
3062 | XTextProperty ct; |
3012 | |
3063 | |
3013 | if (XwcTextListToTextProperty (display->display, &selection.text, 1, XStringStyle, &ct) >= 0) |
3064 | if (XwcTextListToTextProperty (xdisp, &selection.text, 1, XStringStyle, &ct) >= 0) |
3014 | { |
3065 | { |
3015 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3066 | set_string_property (XA_CUT_BUFFER0, ct.value, ct.nitems); |
3016 | XFree (ct.value); |
3067 | XFree (ct.value); |
3017 | } |
3068 | } |
3018 | #endif |
3069 | #endif |
… | |
… | |
3022 | /* |
3073 | /* |
3023 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
3074 | * Mark or select text based upon number of clicks: 1, 2, or 3 |
3024 | * EXT: button 1 press |
3075 | * EXT: button 1 press |
3025 | */ |
3076 | */ |
3026 | void |
3077 | void |
3027 | rxvt_term::selection_click (int clicks, int x, int y) |
3078 | rxvt_term::selection_click (int clicks, int x, int y) NOTHROW |
3028 | { |
3079 | { |
3029 | clicks = ((clicks - 1) % 3) + 1; |
3080 | clicks = ((clicks - 1) % 3) + 1; |
3030 | selection.clicks = clicks; /* save clicks so extend will work */ |
3081 | selection.clicks = clicks; /* save clicks so extend will work */ |
3031 | |
3082 | |
|
|
3083 | if (clicks == 2 && !selection.rect |
|
|
3084 | && HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END))) |
|
|
3085 | { |
|
|
3086 | MEvent.clicks = 1; // what a mess |
|
|
3087 | selection.screen = current_screen; |
|
|
3088 | selection.op = SELECTION_CONT; |
|
|
3089 | return; |
|
|
3090 | } |
|
|
3091 | |
3032 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
3092 | selection_start_colrow (Pixel2Col (x), Pixel2Row (y)); |
3033 | |
3093 | |
3034 | if (clicks == 2 || clicks == 3) |
3094 | if (clicks == 2 || clicks == 3) |
3035 | selection_extend_colrow (selection.mark.col, |
3095 | selection_extend_colrow (selection.mark.col, |
3036 | selection.mark.row + view_start, |
3096 | selection.mark.row - view_start, |
3037 | 0, /* button 3 */ |
3097 | 0, /* button 3 */ |
3038 | 1, /* button press */ |
3098 | 1, /* button press */ |
3039 | 0); /* click change */ |
3099 | 0); /* click change */ |
3040 | } |
3100 | } |
3041 | |
3101 | |
3042 | /* ------------------------------------------------------------------------- */ |
3102 | /* ------------------------------------------------------------------------- */ |
3043 | /* |
3103 | /* |
3044 | * Mark a selection at the specified col/row |
3104 | * Mark a selection at the specified col/row |
3045 | */ |
3105 | */ |
3046 | void |
3106 | void |
3047 | rxvt_term::selection_start_colrow (int col, int row) |
3107 | rxvt_term::selection_start_colrow (int col, int row) NOTHROW |
3048 | { |
3108 | { |
3049 | want_refresh = 1; |
3109 | want_refresh = 1; |
3050 | |
3110 | |
3051 | selection.mark.row = row - view_start; |
3111 | selection.mark.row = row + view_start; |
3052 | selection.mark.col = col; |
3112 | selection.mark.col = col; |
3053 | |
3113 | |
3054 | selection.mark.row = clamp (selection.mark.row, -nsaved, nrow - 1); |
3114 | selection.mark.row = clamp (selection.mark.row, top_row, nrow - 1); |
3055 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3115 | selection.mark.col = clamp (selection.mark.col, 0, ncol - 1); |
3056 | |
3116 | |
3057 | while (selection.mark.col > 0 |
3117 | while (selection.mark.col > 0 |
3058 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3118 | && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR) |
3059 | --selection.mark.col; |
3119 | --selection.mark.col; |
… | |
… | |
3078 | #define DELIMIT_TEXT(x) \ |
3138 | #define DELIMIT_TEXT(x) \ |
3079 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
3139 | (unicode::is_space (x) ? 2 : (x) <= 0xff && !!strchr (rs[Rs_cutchars], (x))) |
3080 | #define DELIMIT_REND(x) 1 |
3140 | #define DELIMIT_REND(x) 1 |
3081 | |
3141 | |
3082 | void |
3142 | void |
3083 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) |
3143 | rxvt_term::selection_delimit_word (enum page_dirn dirn, const row_col_t *mark, row_col_t *ret) NOTHROW |
3084 | { |
3144 | { |
3085 | int col, row, dirnadd, tcol, trow, w1, w2; |
3145 | int col, row, dirnadd, tcol, trow, w1, w2; |
3086 | row_col_t bound; |
3146 | row_col_t bound; |
3087 | text_t *stp; |
3147 | text_t *stp; |
3088 | rend_t *srp; |
3148 | rend_t *srp; |
3089 | |
3149 | |
3090 | if (dirn == UP) |
3150 | if (dirn == UP) |
3091 | { |
3151 | { |
3092 | bound.row = - nsaved - 1; |
3152 | bound.row = top_row - 1; |
3093 | bound.col = 0; |
3153 | bound.col = 0; |
3094 | dirnadd = -1; |
3154 | dirnadd = -1; |
3095 | } |
3155 | } |
3096 | else |
3156 | else |
3097 | { |
3157 | { |
… | |
… | |
3162 | * flag == 0 ==> button 1 |
3222 | * flag == 0 ==> button 1 |
3163 | * flag == 1 ==> button 3 press |
3223 | * flag == 1 ==> button 3 press |
3164 | * flag == 2 ==> button 3 motion |
3224 | * flag == 2 ==> button 3 motion |
3165 | */ |
3225 | */ |
3166 | void |
3226 | void |
3167 | rxvt_term::selection_extend (int x, int y, int flag) |
3227 | rxvt_term::selection_extend (int x, int y, int flag) NOTHROW |
3168 | { |
3228 | { |
3169 | int col = clamp (Pixel2Col (x), 0, ncol); |
3229 | int col = clamp (Pixel2Col (x), 0, ncol); |
3170 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3230 | int row = clamp (Pixel2Row (y), 0, nrow - 1); |
3171 | |
3231 | |
3172 | /* |
3232 | /* |
… | |
… | |
3175 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3235 | * select nothing. Otherwise, if we're to the right of the mark, you have to |
3176 | * be _past_ a character for it to be selected. |
3236 | * be _past_ a character for it to be selected. |
3177 | */ |
3237 | */ |
3178 | if (((selection.clicks % 3) == 1) && !flag |
3238 | if (((selection.clicks % 3) == 1) && !flag |
3179 | && (col == selection.mark.col |
3239 | && (col == selection.mark.col |
3180 | && (row == selection.mark.row + view_start))) |
3240 | && (row == selection.mark.row - view_start))) |
3181 | { |
3241 | { |
3182 | /* select nothing */ |
3242 | /* select nothing */ |
3183 | selection.beg.row = selection.end.row = 0; |
3243 | selection.beg.row = selection.end.row = 0; |
3184 | selection.beg.col = selection.end.col = 0; |
3244 | selection.beg.col = selection.end.col = 0; |
3185 | selection.clicks = 4; |
3245 | selection.clicks = 4; |
… | |
… | |
3198 | /* ------------------------------------------------------------------------- */ |
3258 | /* ------------------------------------------------------------------------- */ |
3199 | /* |
3259 | /* |
3200 | * Extend the selection to the specified col/row |
3260 | * Extend the selection to the specified col/row |
3201 | */ |
3261 | */ |
3202 | void |
3262 | void |
3203 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) |
3263 | rxvt_term::selection_extend_colrow (int32_t col, int32_t row, int button3, int buttonpress, int clickchange) NOTHROW |
3204 | { |
3264 | { |
3205 | row_col_t pos; |
3265 | row_col_t pos; |
3206 | enum { |
3266 | enum { |
3207 | LEFT, RIGHT |
3267 | LEFT, RIGHT |
3208 | } closeto = RIGHT; |
3268 | } closeto = RIGHT; |
… | |
… | |
3240 | selection.beg.col = selection.end.col = selection.mark.col; |
3300 | selection.beg.col = selection.end.col = selection.mark.col; |
3241 | selection.beg.row = selection.end.row = selection.mark.row; |
3301 | selection.beg.row = selection.end.row = selection.mark.row; |
3242 | } |
3302 | } |
3243 | |
3303 | |
3244 | pos.col = col; |
3304 | pos.col = col; |
3245 | pos.row = row - view_start; |
3305 | pos.row = view_start + row; |
3246 | |
3306 | |
3247 | /* |
3307 | /* |
3248 | * This is mainly xterm style selection with a couple of differences, mainly |
3308 | * This is mainly xterm style selection with a couple of differences, mainly |
3249 | * in the way button3 drag extension works. |
3309 | * in the way button3 drag extension works. |
3250 | * We're either doing: button1 drag; button3 press; or button3 drag |
3310 | * We're either doing: button1 drag; button3 press; or button3 drag |
… | |
… | |
3311 | |
3371 | |
3312 | if (selection.clicks == 1) |
3372 | if (selection.clicks == 1) |
3313 | { |
3373 | { |
3314 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3374 | if (selection.beg.col > ROW(selection.beg.row).l //TODO//FIXME//LEN |
3315 | && !ROW(selection.beg.row).is_longer () |
3375 | && !ROW(selection.beg.row).is_longer () |
3316 | #if ENABLE_FRILLS |
3376 | #if !ENABLE_MINIMAL |
3317 | && !selection.rect |
3377 | && !selection.rect |
3318 | #endif |
3378 | #endif |
3319 | ) |
3379 | ) |
3320 | selection.beg.col = ncol; |
3380 | selection.beg.col = ncol; |
3321 | |
3381 | |
3322 | if ( |
3382 | if ( |
3323 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3383 | selection.end.col > ROW(selection.end.row).l //TODO//FIXME//LEN |
3324 | && !ROW(selection.end.row).is_longer () |
3384 | && !ROW(selection.end.row).is_longer () |
3325 | #if ENABLE_FRILLS |
3385 | #if !ENABLE_MINIMAL |
3326 | && !selection.rect |
3386 | && !selection.rect |
3327 | #endif |
3387 | #endif |
3328 | ) |
3388 | ) |
3329 | selection.end.col = ncol; |
3389 | selection.end.col = ncol; |
3330 | } |
3390 | } |
3331 | else if (selection.clicks == 2) |
3391 | else if (selection.clicks == 2) |
3332 | { |
3392 | { |
3333 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3393 | if (ROWCOL_IS_AFTER (selection.end, selection.beg)) |
3334 | selection.end.col--; |
3394 | selection.end.col--; |
3335 | |
3395 | |
3336 | if (!HOOK_INVOKE ((this, HOOK_SEL_EXTEND, DT_END))) |
|
|
3337 | { |
|
|
3338 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3396 | selection_delimit_word (UP, &selection.beg, &selection.beg); |
3339 | selection_delimit_word (DN, &selection.end, &selection.end); |
3397 | selection_delimit_word (DN, &selection.end, &selection.end); |
3340 | } |
|
|
3341 | } |
3398 | } |
3342 | else if (selection.clicks == 3) |
3399 | else if (selection.clicks == 3) |
3343 | { |
3400 | { |
3344 | #if ENABLE_FRILLS |
3401 | #if ENABLE_FRILLS |
3345 | if (OPTION (Opt_tripleclickwords)) |
3402 | if (OPTION (Opt_tripleclickwords)) |
… | |
… | |
3350 | { |
3407 | { |
3351 | if (!ROW(end_row).is_longer ()) |
3408 | if (!ROW(end_row).is_longer ()) |
3352 | { |
3409 | { |
3353 | selection.end.row = end_row; |
3410 | selection.end.row = end_row; |
3354 | selection.end.col = ROW(end_row).l; |
3411 | selection.end.col = ROW(end_row).l; |
|
|
3412 | # if !ENABLE_MINIMAL |
3355 | selection_remove_trailing_spaces (); |
3413 | selection_remove_trailing_spaces (); |
|
|
3414 | # endif |
3356 | break; |
3415 | break; |
3357 | } |
3416 | } |
3358 | } |
3417 | } |
3359 | } |
3418 | } |
3360 | else |
3419 | else |
… | |
… | |
3389 | selection.mark.row = selection.beg.row; |
3448 | selection.mark.row = selection.beg.row; |
3390 | selection.mark.col = selection.beg.col; |
3449 | selection.mark.col = selection.beg.col; |
3391 | } |
3450 | } |
3392 | } |
3451 | } |
3393 | |
3452 | |
3394 | #if ENABLE_FRILLS |
3453 | #if !ENABLE_MINIMAL |
3395 | if (selection.rect && selection.beg.col > selection.end.col) |
3454 | if (selection.rect && selection.beg.col > selection.end.col) |
3396 | ::swap (selection.beg.col, selection.end.col); |
3455 | ::swap (selection.beg.col, selection.end.col); |
3397 | #endif |
3456 | #endif |
3398 | } |
3457 | } |
3399 | |
3458 | |
3400 | #if ENABLE_FRILLS |
3459 | #if !ENABLE_MINIMAL |
3401 | void |
3460 | void |
3402 | rxvt_term::selection_remove_trailing_spaces () |
3461 | rxvt_term::selection_remove_trailing_spaces () NOTHROW |
3403 | { |
3462 | { |
3404 | int32_t end_col, end_row; |
3463 | int32_t end_col, end_row; |
3405 | text_t *stp; |
3464 | text_t *stp; |
3406 | |
3465 | |
3407 | end_col = selection.end.col; |
3466 | end_col = selection.end.col; |
… | |
… | |
3445 | /* |
3504 | /* |
3446 | * Double click on button 3 when already selected |
3505 | * Double click on button 3 when already selected |
3447 | * EXT: button 3 double click |
3506 | * EXT: button 3 double click |
3448 | */ |
3507 | */ |
3449 | void |
3508 | void |
3450 | rxvt_term::selection_rotate (int x, int y) |
3509 | rxvt_term::selection_rotate (int x, int y) NOTHROW |
3451 | { |
3510 | { |
3452 | selection.clicks = selection.clicks % 3 + 1; |
3511 | selection.clicks = selection.clicks % 3 + 1; |
3453 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3512 | selection_extend_colrow (Pixel2Col (x), Pixel2Row (y), 1, 0, 1); |
3454 | } |
3513 | } |
3455 | |
3514 | |
… | |
… | |
3457 | /* |
3516 | /* |
3458 | * Respond to a request for our current selection |
3517 | * Respond to a request for our current selection |
3459 | * EXT: SelectionRequest |
3518 | * EXT: SelectionRequest |
3460 | */ |
3519 | */ |
3461 | void |
3520 | void |
3462 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) |
3521 | rxvt_term::selection_send (const XSelectionRequestEvent &rq) NOTHROW |
3463 | { |
3522 | { |
3464 | XSelectionEvent ev; |
3523 | XSelectionEvent ev; |
3465 | dDisp; |
|
|
3466 | |
3524 | |
3467 | ev.type = SelectionNotify; |
3525 | ev.type = SelectionNotify; |
3468 | ev.property = None; |
3526 | ev.property = None; |
3469 | ev.display = rq.display; |
3527 | ev.display = rq.display; |
3470 | ev.requestor = rq.requestor; |
3528 | ev.requestor = rq.requestor; |
… | |
… | |
3484 | *target++ = xa[XA_COMPOUND_TEXT]; |
3542 | *target++ = xa[XA_COMPOUND_TEXT]; |
3485 | #if X_HAVE_UTF8_STRING |
3543 | #if X_HAVE_UTF8_STRING |
3486 | *target++ = xa[XA_UTF8_STRING]; |
3544 | *target++ = xa[XA_UTF8_STRING]; |
3487 | #endif |
3545 | #endif |
3488 | |
3546 | |
3489 | XChangeProperty (disp, rq.requestor, rq.property, XA_ATOM, |
3547 | XChangeProperty (xdisp, rq.requestor, rq.property, XA_ATOM, |
3490 | 32, PropModeReplace, |
3548 | 32, PropModeReplace, |
3491 | (unsigned char *)target_list, target - target_list); |
3549 | (unsigned char *)target_list, target - target_list); |
3492 | ev.property = rq.property; |
3550 | ev.property = rq.property; |
3493 | } |
3551 | } |
3494 | #if TODO // TODO |
3552 | #if TODO // TODO |
… | |
… | |
3497 | /* TODO: Handle MULTIPLE */ |
3555 | /* TODO: Handle MULTIPLE */ |
3498 | } |
3556 | } |
3499 | #endif |
3557 | #endif |
3500 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3558 | else if (rq.target == xa[XA_TIMESTAMP] && selection.text) |
3501 | { |
3559 | { |
3502 | XChangeProperty (disp, rq.requestor, rq.property, rq.target, |
3560 | XChangeProperty (xdisp, rq.requestor, rq.property, rq.target, |
3503 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3561 | 32, PropModeReplace, (unsigned char *)&selection_time, 1); |
3504 | ev.property = rq.property; |
3562 | ev.property = rq.property; |
3505 | } |
3563 | } |
3506 | else if (rq.target == XA_STRING |
3564 | else if (rq.target == XA_STRING |
3507 | || rq.target == xa[XA_TEXT] |
3565 | || rq.target == xa[XA_TEXT] |
… | |
… | |
3531 | style = enc_string; |
3589 | style = enc_string; |
3532 | else if (target == xa[XA_TEXT]) |
3590 | else if (target == xa[XA_TEXT]) |
3533 | style = enc_text; |
3591 | style = enc_text; |
3534 | else if (target == xa[XA_COMPOUND_TEXT]) |
3592 | else if (target == xa[XA_COMPOUND_TEXT]) |
3535 | style = enc_compound_text; |
3593 | style = enc_compound_text; |
3536 | #if ENABLE_FRILLS |
3594 | #if !ENABLE_MINIMAL |
3537 | else if (target == xa[XA_UTF8_STRING]) |
3595 | else if (target == xa[XA_UTF8_STRING]) |
3538 | style = enc_utf8; |
3596 | style = enc_utf8; |
3539 | #endif |
3597 | #endif |
3540 | else |
3598 | else |
3541 | { |
3599 | { |
… | |
… | |
3552 | { |
3610 | { |
3553 | cl = L""; |
3611 | cl = L""; |
3554 | selectlen = 0; |
3612 | selectlen = 0; |
3555 | } |
3613 | } |
3556 | |
3614 | |
3557 | #if ENABLE_FRILLS |
3615 | #if !ENABLE_MINIMAL |
3558 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3616 | // xlib is horribly broken with respect to UTF8_STRING, and nobody cares to fix it |
3559 | // so recode it manually |
3617 | // so recode it manually |
3560 | if (style == enc_utf8) |
3618 | if (style == enc_utf8) |
3561 | { |
3619 | { |
3562 | freect = 1; |
3620 | freect = 1; |
… | |
… | |
3565 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3623 | ct.value = (unsigned char *)rxvt_wcstoutf8 (cl, selectlen); |
3566 | ct.nitems = strlen ((char *)ct.value); |
3624 | ct.nitems = strlen ((char *)ct.value); |
3567 | } |
3625 | } |
3568 | else |
3626 | else |
3569 | #endif |
3627 | #endif |
3570 | if (XwcTextListToTextProperty (disp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3628 | if (XwcTextListToTextProperty (xdisp, &cl, 1, (XICCEncodingStyle) style, &ct) >= 0) |
3571 | freect = 1; |
3629 | freect = 1; |
3572 | else |
3630 | else |
3573 | { |
3631 | { |
3574 | /* if we failed to convert then send it raw */ |
3632 | /* if we failed to convert then send it raw */ |
3575 | ct.value = (unsigned char *)cl; |
3633 | ct.value = (unsigned char *)cl; |
3576 | ct.nitems = selectlen; |
3634 | ct.nitems = selectlen; |
3577 | ct.encoding = target; |
3635 | ct.encoding = target; |
3578 | } |
3636 | } |
3579 | |
3637 | |
3580 | XChangeProperty (disp, rq.requestor, rq.property, |
3638 | XChangeProperty (xdisp, rq.requestor, rq.property, |
3581 | ct.encoding, 8, PropModeReplace, |
3639 | ct.encoding, 8, PropModeReplace, |
3582 | ct.value, (int)ct.nitems); |
3640 | ct.value, (int)ct.nitems); |
3583 | ev.property = rq.property; |
3641 | ev.property = rq.property; |
3584 | |
3642 | |
3585 | if (freect) |
3643 | if (freect) |
3586 | XFree (ct.value); |
3644 | XFree (ct.value); |
3587 | } |
3645 | } |
3588 | |
3646 | |
3589 | XSendEvent (disp, rq.requestor, False, 0L, (XEvent *)&ev); |
3647 | XSendEvent (xdisp, rq.requestor, False, 0L, (XEvent *)&ev); |
3590 | } |
3648 | } |
3591 | |
3649 | |
3592 | /* ------------------------------------------------------------------------- * |
3650 | /* ------------------------------------------------------------------------- * |
3593 | * MOUSE ROUTINES * |
3651 | * MOUSE ROUTINES * |
3594 | * ------------------------------------------------------------------------- */ |
3652 | * ------------------------------------------------------------------------- */ |
3595 | |
3653 | |
3596 | /* |
3654 | /* |
3597 | * return col/row values corresponding to x/y pixel values |
3655 | * return col/row values corresponding to x/y pixel values |
3598 | */ |
3656 | */ |
3599 | void |
3657 | void |
3600 | rxvt_term::pixel_position (int *x, int *y) |
3658 | rxvt_term::pixel_position (int *x, int *y) NOTHROW |
3601 | { |
3659 | { |
3602 | *x = Pixel2Col (*x); |
3660 | *x = Pixel2Col (*x); |
3603 | /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ |
3661 | /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */ |
3604 | *y = Pixel2Row (*y); |
3662 | *y = Pixel2Row (*y); |
3605 | /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ |
3663 | /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */ |
3606 | } |
3664 | } |
3607 | |
3665 | |
3608 | /* ------------------------------------------------------------------------- */ |
3666 | /* ------------------------------------------------------------------------- */ |
3609 | #ifdef USE_XIM |
3667 | #ifdef USE_XIM |
3610 | void |
3668 | void |
3611 | rxvt_term::im_set_position (XPoint &pos) |
3669 | rxvt_term::im_set_position (XPoint &pos) NOTHROW |
3612 | { |
3670 | { |
3613 | XWindowAttributes xwa; |
3671 | XWindowAttributes xwa; |
3614 | |
3672 | |
3615 | XGetWindowAttributes (display->display, vt, &xwa); |
3673 | XGetWindowAttributes (xdisp, vt, &xwa); |
3616 | |
3674 | |
3617 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3675 | pos.x = xwa.x + Col2Pixel (screen.cur.col); |
3618 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3676 | pos.y = xwa.y + Height2Pixel (screen.cur.row) + fbase; |
3619 | } |
3677 | } |
3620 | #endif |
3678 | #endif |
3621 | |
3679 | |
3622 | #if ENABLE_OVERLAY |
3680 | #if ENABLE_OVERLAY |
3623 | void |
3681 | void |
3624 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) |
3682 | rxvt_term::scr_overlay_new (int x, int y, int w, int h) NOTHROW |
3625 | { |
3683 | { |
3626 | if (nrow < 1 || ncol < 1) |
3684 | if (nrow < 1 || ncol < 1) |
3627 | return; |
3685 | return; |
3628 | |
3686 | |
3629 | want_refresh = 1; |
3687 | want_refresh = 1; |
… | |
… | |
3674 | *rp = r; |
3732 | *rp = r; |
3675 | } |
3733 | } |
3676 | } |
3734 | } |
3677 | |
3735 | |
3678 | void |
3736 | void |
3679 | rxvt_term::scr_overlay_off () |
3737 | rxvt_term::scr_overlay_off () NOTHROW |
3680 | { |
3738 | { |
3681 | if (!ov_text) |
3739 | if (!ov_text) |
3682 | return; |
3740 | return; |
3683 | |
3741 | |
3684 | want_refresh = 1; |
3742 | want_refresh = 1; |
… | |
… | |
3692 | delete [] ov_text; ov_text = 0; |
3750 | delete [] ov_text; ov_text = 0; |
3693 | delete [] ov_rend; ov_rend = 0; |
3751 | delete [] ov_rend; ov_rend = 0; |
3694 | } |
3752 | } |
3695 | |
3753 | |
3696 | void |
3754 | void |
3697 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) |
3755 | rxvt_term::scr_overlay_set (int x, int y, text_t text, rend_t rend) NOTHROW |
3698 | { |
3756 | { |
3699 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3757 | if (!ov_text || x >= ov_w - 2 || y >= ov_h - 2) |
3700 | return; |
3758 | return; |
3701 | |
3759 | |
3702 | x++, y++; |
3760 | x++, y++; |
… | |
… | |
3704 | ov_text[y][x] = text; |
3762 | ov_text[y][x] = text; |
3705 | ov_rend[y][x] = rend; |
3763 | ov_rend[y][x] = rend; |
3706 | } |
3764 | } |
3707 | |
3765 | |
3708 | void |
3766 | void |
3709 | rxvt_term::scr_overlay_set (int x, int y, const char *s) |
3767 | rxvt_term::scr_overlay_set (int x, int y, const char *s) NOTHROW |
3710 | { |
3768 | { |
3711 | while (*s) |
3769 | while (*s) |
3712 | scr_overlay_set (x++, y, *s++); |
3770 | scr_overlay_set (x++, y, *s++); |
3713 | } |
3771 | } |
3714 | |
3772 | |
3715 | void |
3773 | void |
3716 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) |
3774 | rxvt_term::scr_overlay_set (int x, int y, const wchar_t *s) NOTHROW |
3717 | { |
3775 | { |
3718 | while (*s) |
3776 | while (*s) |
3719 | { |
3777 | { |
3720 | text_t t = *s++; |
3778 | text_t t = *s++; |
3721 | int width = wcwidth (t); |
3779 | int width = WCWIDTH (t); |
3722 | |
3780 | |
3723 | while (width--) |
3781 | while (width--) |
3724 | { |
3782 | { |
3725 | scr_overlay_set (x++, y, t); |
3783 | scr_overlay_set (x++, y, t); |
3726 | t = NOCHAR; |
3784 | t = NOCHAR; |
3727 | } |
3785 | } |
3728 | } |
3786 | } |
3729 | } |
3787 | } |
3730 | |
3788 | |
3731 | void |
3789 | void |
3732 | rxvt_term::scr_swap_overlay () |
3790 | rxvt_term::scr_swap_overlay () NOTHROW |
3733 | { |
3791 | { |
3734 | if (!ov_text) |
3792 | if (!ov_text) |
3735 | return; |
3793 | return; |
3736 | |
3794 | |
3737 | // swap screen mem with overlay |
3795 | // swap screen mem with overlay |
3738 | for (int y = ov_h; y--; ) |
3796 | for (int y = ov_h; y--; ) |
3739 | { |
3797 | { |
3740 | text_t *t1 = ov_text[y]; |
3798 | text_t *t1 = ov_text[y]; |
3741 | rend_t *r1 = ov_rend[y]; |
3799 | rend_t *r1 = ov_rend[y]; |
3742 | |
3800 | |
3743 | text_t *t2 = ROW(y + ov_y - view_start).t + ov_x; |
3801 | text_t *t2 = ROW(y + ov_y + view_start).t + ov_x; |
3744 | rend_t *r2 = ROW(y + ov_y - view_start).r + ov_x; |
3802 | rend_t *r2 = ROW(y + ov_y + view_start).r + ov_x; |
3745 | |
3803 | |
3746 | for (int x = ov_w; x--; ) |
3804 | for (int x = ov_w; x--; ) |
3747 | { |
3805 | { |
3748 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3806 | text_t t = *t1; *t1++ = *t2; *t2++ = t; |
3749 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |
3807 | rend_t r = *r1; *r1++ = *r2; *r2++ = SET_FONT (r, FONTSET (r)->find_font (t)); |