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

Comparing rxvt-unicode/src/screen.C (file contents):
Revision 1.7 by pcg, Tue Dec 16 23:04:13 2003 UTC vs.
Revision 1.169 by root, Tue Oct 25 19:04:46 2005 UTC

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

Diff Legend

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