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.18 by pcg, Wed Jan 28 23:40:50 2004 UTC vs.
Revision 1.33 by pcg, Sun Feb 22 17:13:21 2004 UTC

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

Diff Legend

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